From c0d6df78da8b901ad05f8932933f5106e16bafa2 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 24 Feb 2012 17:08:52 +0000 Subject: Generate a correct test_env.ps1 for Windows test runs; modify the python-invoking test scripts to pick up proper settings from test_env.ps1. Also improved run_test.ps1 to not look for an exe whose proper path has been supplied already; allowed ha_test to try to execute. Fixes QPID-3870 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1293340 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/python_tests.ps1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'cpp/src/tests/python_tests.ps1') diff --git a/cpp/src/tests/python_tests.ps1 b/cpp/src/tests/python_tests.ps1 index 9f8b9890c4..f7caa8f75a 100644 --- a/cpp/src/tests/python_tests.ps1 +++ b/cpp/src/tests/python_tests.ps1 @@ -26,8 +26,7 @@ if (!(Test-Path $PYTHON_DIR -pathType Container)) { exit 1 } -$PYTHON_TEST_DIR = "$srcdir\..\..\..\tests\src\py" -$QMF_LIB = "$srcdir\..\..\..\extras\qmf\src\py" +. .\test_env.ps1 if (Test-Path env:FAILING) { $fails = "-I $env:FAILING" @@ -39,7 +38,5 @@ else { $tests = "$args" } -#cd $PYTHON_DIR -$env:PYTHONPATH="$PYTHON_DIR;$PYTHON_TEST_DIR;$env:PYTHONPATH;$QMF_LIB" python $PYTHON_DIR/qpid-python-test -m qpid_tests.broker_0_10 -m qpid.tests -b localhost:$env:QPID_PORT $fails $tests exit $LASTEXITCODE -- cgit v1.2.1