From dac7a9ee9c6d3fe1ecfb1e3fcca108af55fcf703 Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Wed, 28 Apr 2010 20:29:54 +0000
Subject: Fix path to broker exe so it can be stopped when needed.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@939077 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/tests/run_acl_tests.ps1 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'qpid/cpp')

diff --git a/qpid/cpp/src/tests/run_acl_tests.ps1 b/qpid/cpp/src/tests/run_acl_tests.ps1
index 81c10e03f0..a1848779c7 100644
--- a/qpid/cpp/src/tests/run_acl_tests.ps1
+++ b/qpid/cpp/src/tests/run_acl_tests.ps1
@@ -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
-- 
cgit v1.2.1