diff options
| author | Stephen D. Huston <shuston@apache.org> | 2010-04-21 21:18:06 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2010-04-21 21:18:06 +0000 |
| commit | 693efb4a64453bf1018a8f14004c0263afa8dabb (patch) | |
| tree | 162afcdc207d20fd41bcfcae193abe2012d72b0a /qpid/cpp/src | |
| parent | fd39e9e9c545017dd1c48ecacde935543be038f9 (diff) | |
| download | qpid-python-693efb4a64453bf1018a8f14004c0263afa8dabb.tar.gz | |
Add QMF_LIB to PYTHONPATH to pick up qmf.console
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@936519 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/tests/python_tests.ps1 | 3 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/run_federation_tests.ps1 | 5 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/run_store_tests.ps1 | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/python_tests.ps1 b/qpid/cpp/src/tests/python_tests.ps1 index 3076d7bf9a..9f8b9890c4 100644 --- a/qpid/cpp/src/tests/python_tests.ps1 +++ b/qpid/cpp/src/tests/python_tests.ps1 @@ -27,6 +27,7 @@ if (!(Test-Path $PYTHON_DIR -pathType Container)) { } $PYTHON_TEST_DIR = "$srcdir\..\..\..\tests\src\py" +$QMF_LIB = "$srcdir\..\..\..\extras\qmf\src\py" if (Test-Path env:FAILING) { $fails = "-I $env:FAILING" @@ -39,6 +40,6 @@ else { } #cd $PYTHON_DIR -$env:PYTHONPATH="$PYTHON_DIR;$PYTHON_TEST_DIR;$env:PYTHONPATH" +$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 diff --git a/qpid/cpp/src/tests/run_federation_tests.ps1 b/qpid/cpp/src/tests/run_federation_tests.ps1 index 087c65296c..bbbe0f3bf0 100644 --- a/qpid/cpp/src/tests/run_federation_tests.ps1 +++ b/qpid/cpp/src/tests/run_federation_tests.ps1 @@ -26,6 +26,9 @@ if (!(Test-Path $PYTHON_DIR -pathType Container)) { exit 1 } +$PYTHON_TEST_DIR = "$srcdir\..\..\..\tests\src\py" +$QMF_LIB = "$srcdir\..\..\..\extras\qmf\src\py" + # Test runs from the tests directory but the broker executable is one level # up, and most likely in a subdirectory from there based on what build type. # Look around for it before trying to start it. @@ -70,7 +73,7 @@ trap { &start_brokers "Running federation tests using brokers on ports $env:LOCAL_PORT $env:REMOTE_PORT" -$env:PYTHONPATH="$PYTHON_DIR;$srcdir" +$env:PYTHONPATH="$PYTHON_DIR;$PYTHON_TEST_DIR;$env:PYTHONPATH;$QMF_LIB" $tests = "*" Invoke-Expression "python $PYTHON_DIR/qpid-python-test -m federation -b localhost:$env:LOCAL_PORT -Dremote-port=$env:REMOTE_PORT $tests" | Out-Default $RETCODE=$LASTEXITCODE diff --git a/qpid/cpp/src/tests/run_store_tests.ps1 b/qpid/cpp/src/tests/run_store_tests.ps1 index f4d43a57f7..0e165a2e27 100644 --- a/qpid/cpp/src/tests/run_store_tests.ps1 +++ b/qpid/cpp/src/tests/run_store_tests.ps1 @@ -30,6 +30,8 @@ if (!(Test-Path $PYTHON_DIR -pathType Container)) { exit 1 } +$QMF_LIB = "$srcdir\..\..\..\extras\qmf\src\py" + # Test runs from the tests directory but the broker executable is one level # up, and most likely in a subdirectory from there based on what build type. # Look around for it before trying to start it. @@ -73,7 +75,7 @@ if (!(Test-Path qpidd-store.port)) { set-item -path env:QPID_PORT -value (get-content -path qpidd-store.port -totalcount 1) Remove-Item qpidd-store.port $PYTHON_TEST_DIR = "$srcdir\..\..\..\tests\src\py\qpid_tests\broker_0_10" -$env:PYTHONPATH="$PYTHON_DIR;$PYTHON_TEST_DIR;$env:PYTHONPATH" +$env:PYTHONPATH="$PYTHON_DIR;$PYTHON_TEST_DIR;$env:PYTHONPATH;$QMF_LIB" python $PYTHON_DIR/qpid-python-test -m dtx -m persistence -b localhost:$env:QPID_PORT $fails $tests $RETCODE=$LASTEXITCODE if ($RETCODE -ne 0) { |