qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shus...@apache.org
Subject svn commit: r939077 - /qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1
Date Wed, 28 Apr 2010 20:29:54 GMT
Author: shuston
Date: Wed Apr 28 20:29:54 2010
New Revision: 939077

URL: http://svn.apache.org/viewvc?rev=939077&view=rev
Log:
Fix path to broker exe so it can be stopped when needed.

Modified:
    qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1

Modified: qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1?rev=939077&r1=939076&r2=939077&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1 (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1 Wed Apr 28 20:29:54 2010
@@ -41,8 +41,10 @@ Function start_broker($acl_options)
     "Cannot locate qpidd.exe"
     exit 1
   }
-  $BROKER_EXE = $prog
-  Remove-Item qpidd.port
+  $Global:BROKER_EXE = $prog
+  if (Test-Path qpidd.port) {
+    Remove-Item qpidd.port
+  }
   $cmdline = "$prog --auth=no --no-module-dir --port=0 --log-to-file qpidd.log $acl_options
| foreach { set-content qpidd.port `$_ }"
   $cmdblock = $executioncontext.invokecommand.NewScriptBlock($cmdline)
   . $srcdir\background.ps1 $cmdblock
@@ -61,13 +63,12 @@ Function start_broker($acl_options)
 
 Function stop_broker
 {
-  "Stopping $BROKER_EXE"
-  Invoke-Expression "$BROKER_EXE --no-module-dir -q --port $env:BROKER_PORT" | Write-Output
+  "Stopping $Global:BROKER_EXE"
+  Invoke-Expression "$Global:BROKER_EXE --no-module-dir -q --port $env:BROKER_PORT" | Write-Output
   Remove-Item qpidd.port
 }
 
 $DATA_DIR = [IO.Directory]::GetCurrentDirectory() + "\data_dir"
-"DATA_DIR is $DATA_DIR"
 Remove-Item $DATA_DIR -recurse
 New-Item $DATA_DIR -type directory
 Copy-Item $srcdir\policy.acl $DATA_DIR



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message