diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-11-28 19:37:40 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-11-28 19:37:40 +0100 |
| commit | abbe8a742c7c33bd2874545b5070860e896e9151 (patch) | |
| tree | b6ca4a736272600e633fd1eab9bfb436a218bb71 /scripts/Util.py | |
| parent | Fixed networkProxy, IceGrid/admin, metrics test failures (diff) | |
| download | ice-abbe8a742c7c33bd2874545b5070860e896e9151.tar.bz2 ice-abbe8a742c7c33bd2874545b5070860e896e9151.tar.xz ice-abbe8a742c7c33bd2874545b5070860e896e9151.zip | |
Fixed Windows test failure caused by wrong build directory
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 3809345e684..ef91502b99e 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -229,7 +229,10 @@ class Windows(Platform): return "lib" def getBuildSubDir(self, name, current): - return os.path.join("msbuild", name, current.config.buildPlatform, current.config.buildConfig) + if os.path.exists(os.path.join(current.testcase.getPath(), "msbuild", name)): + return os.path.join("msbuild", name, current.config.buildPlatform, current.config.buildConfig) + else: + return os.path.join("msbuild", current.config.buildPlatform, current.config.buildConfig) def getLdPathEnvName(self): return "PATH" |