summaryrefslogtreecommitdiff
path: root/cpp/src/tests/run_test.ps1
diff options
context:
space:
mode:
authorStephen D. Huston <shuston@apache.org>2010-01-27 21:50:18 +0000
committerStephen D. Huston <shuston@apache.org>2010-01-27 21:50:18 +0000
commitcf480cf05ea22595e2968ae6c5fdd6d6c78b44c2 (patch)
treeb13fdba564a5019494301fe2fafa50974d619079 /cpp/src/tests/run_test.ps1
parentd1c4af32b27b6d242d2b15e4dc91152a6d3e4a5a (diff)
downloadqpid-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/run_test.ps1')
-rw-r--r--cpp/src/tests/run_test.ps18
1 files changed, 2 insertions, 6 deletions
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.