diff options
| author | Jose <jose@zeroc.com> | 2016-05-11 20:04:01 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-11 20:04:01 +0200 |
| commit | 52fe006e4ad10573b08710e36517f0c4b95a0617 (patch) | |
| tree | d46033709ea755e52f7bb30e44522769e75a0317 /scripts/TestUtil.py | |
| parent | Fix typo "await" CSharp keyword (diff) | |
| download | ice-52fe006e4ad10573b08710e36517f0c4b95a0617.tar.bz2 ice-52fe006e4ad10573b08710e36517f0c4b95a0617.tar.xz ice-52fe006e4ad10573b08710e36517f0c4b95a0617.zip | |
Windows testsuite fixes
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index c105967412d..50d7646d8fe 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -2548,9 +2548,9 @@ def getTestDirectory(name, baseDir = os.getcwd()): configuration = ("cpp11-" if cpp11 else "") + ("static" if static else "shared") if os.path.isdir(os.path.join(baseDir, buildDir, name)): - return os.path.join(buildDir, name, platform, configuration) + return os.path.join(baseDir, buildDir, name, platform, configuration) else: - return os.path.join(buildDir, platform, configuration) + return os.path.join(baseDir, buildDir, platform, configuration) def getTestExecutable(name, baseDir = os.getcwd()): return os.path.join(getTestDirectory(name, baseDir), name) |