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/run_header_test.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/run_header_test.ps1')
| -rw-r--r-- | qpid/cpp/src/tests/run_header_test.ps1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/run_header_test.ps1 b/qpid/cpp/src/tests/run_header_test.ps1 index 7d3e43a30f..344fac9cf9 100644 --- a/qpid/cpp/src/tests/run_header_test.ps1 +++ b/qpid/cpp/src/tests/run_header_test.ps1 @@ -28,6 +28,8 @@ if (!(Test-Path $PYTHON_DIR -pathType Container)) { exit 0 } +. .\test_env.ps1 + if (Test-Path qpidd.port) { set-item -path env:QPID_PORT -value (get-content -path qpidd.port -totalcount 1) } @@ -42,6 +44,5 @@ if (!(Test-Path $prog)) { } Invoke-Expression "$prog -p $env:QPID_PORT" | Write-Output -$env:PYTHONPATH="$PYTHON_DIR;$env:PYTHONPATH" Invoke-Expression "python $srcdir/header_test.py localhost $env:QPID_PORT" | Write-Output exit $LASTEXITCODE |