diff options
| author | Stephen D. Huston <shuston@apache.org> | 2012-02-24 17:08:52 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2012-02-24 17:08:52 +0000 |
| commit | 84aa47345dd4fd972284086e6f3a1f06bd1adb6f (patch) | |
| tree | a6e7c5ff804d12b75a68ade2e8bc4c3355ed5e74 /qpid/cpp/src/tests/python_tests.ps1 | |
| parent | 7c0146192f181793594a2f8f805708fae6502031 (diff) | |
| download | qpid-python-84aa47345dd4fd972284086e6f3a1f06bd1adb6f.tar.gz | |
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@1293340 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/python_tests.ps1')
| -rw-r--r-- | qpid/cpp/src/tests/python_tests.ps1 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/python_tests.ps1 b/qpid/cpp/src/tests/python_tests.ps1 index 9f8b9890c4..f7caa8f75a 100644 --- a/qpid/cpp/src/tests/python_tests.ps1 +++ b/qpid/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 |