diff options
| author | Stephen D. Huston <shuston@apache.org> | 2010-01-27 21:50:18 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2010-01-27 21:50:18 +0000 |
| commit | cf480cf05ea22595e2968ae6c5fdd6d6c78b44c2 (patch) | |
| tree | b13fdba564a5019494301fe2fafa50974d619079 /cpp/src/tests | |
| parent | d1c4af32b27b6d242d2b15e4dc91152a6d3e4a5a (diff) | |
| download | qpid-python-cf480cf05ea22595e2968ae6c5fdd6d6c78b44c2.tar.gz | |
Locate an executable's path correctly and set up in PATH properly. Catch up run_federation_tests.ps1 to match latest run_federation_test script.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903851 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/run_federation_tests.ps1 | 7 | ||||
| -rw-r--r-- | cpp/src/tests/run_test.ps1 | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/cpp/src/tests/run_federation_tests.ps1 b/cpp/src/tests/run_federation_tests.ps1 index dd0ea2fe5b..087c65296c 100644 --- a/cpp/src/tests/run_federation_tests.ps1 +++ b/cpp/src/tests/run_federation_tests.ps1 @@ -40,7 +40,7 @@ if (!(Test-Path $prog)) { "Cannot locate qpidd.exe" exit 1 } -$cmdline = "$prog --auth=no --no-module-dir --port=0 --log-to-file qpidd.log $args | foreach { set-content qpidd.port `$_ }" +$cmdline = "$prog --auth=no --no-module-dir --no-data-dir --port=0 --ssl-port=0 --log-to-file qpidd.log $args | foreach { set-content qpidd.port `$_ }" $cmdblock = $executioncontext.invokecommand.NewScriptBlock($cmdline) function start_brokers { @@ -70,8 +70,9 @@ trap { &start_brokers "Running federation tests using brokers on ports $env:LOCAL_PORT $env:REMOTE_PORT" -$env:PYTHONPATH=$PYTHON_DIR -python $srcdir/federation.py -v -s $srcdir\..\..\..\specs\amqp.0-10-qpid-errata.xml -b localhost:$env:LOCAL_PORT --remote-port $env:REMOTE_PORT $args +$env:PYTHONPATH="$PYTHON_DIR;$srcdir" +$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 &stop_brokers if ($RETCODE -ne 0) { diff --git a/cpp/src/tests/run_test.ps1 b/cpp/src/tests/run_test.ps1 index 4deb07bf71..ca990bc057 100644 --- a/cpp/src/tests/run_test.ps1 +++ b/cpp/src/tests/run_test.ps1 @@ -30,15 +30,11 @@ $env:BOOST_TEST_SHOW_PROGRESS = "yes" # one level up. $prog = $args[0] $is_script = $prog -match ".ps1$" -if (Test-Path $prog) { - $env:QPID_LIB_DIR = ".." - $env:PATH += ";.." -} -else { +if (!$is_script) { . $srcdir\find_prog.ps1 $prog $args[0] = $prog $env:QPID_LIB_DIR = "..\$sub" - $env:PATH += "$dir\$sub;..\$sub" + $env:PATH += ";$dir\$sub;..\$sub" } # If qpidd.port exists and is not empty run test with QPID_PORT set. |