summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests
diff options
context:
space:
mode:
authorStephen D. Huston <shuston@apache.org>2010-04-21 21:25:55 +0000
committerStephen D. Huston <shuston@apache.org>2010-04-21 21:25:55 +0000
commit1dfffd6555da0b05d88b8e25e4d21951337c4faf (patch)
treeb59bbca667a4de72bc570bbf0efff77546381d75 /qpid/cpp/src/tests
parent693efb4a64453bf1018a8f14004c0263afa8dabb (diff)
downloadqpid-python-1dfffd6555da0b05d88b8e25e4d21951337c4faf.tar.gz
Add QMF_LIB to PYTHONPATH to pick up qmf.console
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@936520 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
-rw-r--r--qpid/cpp/src/tests/run_acl_tests.ps19
1 files changed, 6 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/run_acl_tests.ps1 b/qpid/cpp/src/tests/run_acl_tests.ps1
index e2b388a43f..81c10e03f0 100644
--- a/qpid/cpp/src/tests/run_acl_tests.ps1
+++ b/qpid/cpp/src/tests/run_acl_tests.ps1
@@ -25,8 +25,11 @@ if (!(Test-Path $PYTHON_DIR -pathType Container)) {
"Skipping acl tests as python libs not found"
exit 1
}
-$env:PYTHONPATH="$PYTHON_DIR;$srcdir"
-$BROKER_EXE = ""
+
+$PYTHON_TEST_DIR = "$srcdir\..\..\..\tests\src\py"
+$QMF_LIB = "$srcdir\..\..\..\extras\qmf\src\py"
+$env:PYTHONPATH="$PYTHON_DIR;$srcdir;$PYTHON_TEST_DIR;$QMF_LIB"
+$Global:BROKER_EXE = ""
Function start_broker($acl_options)
{
@@ -58,7 +61,7 @@ Function start_broker($acl_options)
Function stop_broker
{
- "Stoppping $BROKER_EXE"
+ "Stopping $BROKER_EXE"
Invoke-Expression "$BROKER_EXE --no-module-dir -q --port $env:BROKER_PORT" | Write-Output
Remove-Item qpidd.port
}