diff options
| author | Jose <jose@zeroc.com> | 2014-11-28 15:41:22 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-28 15:41:22 +0100 |
| commit | f275d8515e2ba5594020e8a19b868f3db58bbd2e (patch) | |
| tree | f31066ae7e392afabf4f7a1749ec11ad3e72fcdd /scripts/TestUtil.py | |
| parent | Ubuntu package updates (diff) | |
| download | ice-f275d8515e2ba5594020e8a19b868f3db58bbd2e.tar.bz2 ice-f275d8515e2ba5594020e8a19b868f3db58bbd2e.tar.xz ice-f275d8515e2ba5594020e8a19b868f3db58bbd2e.zip | |
Test/Demo script fixes
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index c35f8a0428d..d9931d42e33 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1734,6 +1734,15 @@ def getTestEnv(lang, testdir): else: thirdPartyHome = getThirdpartyHome() if thirdPartyHome: + # + # Add third party home to PATH, to use db_xx tools + # + if isWin32(): + addPathToEnv("PATH", os.path.join(getThirdpartyHome(), "bin\\x64" if x64 else "bin"), env) + if getCppCompiler() == "VC110": + addPathToEnv("PATH", os.path.join(getThirdpartyHome(), "bin\\vc110\\x64" if x64 else "bin\\vc110"), env) + elif isDarwin(): + addPathToEnv("PATH", os.path.join(getThirdpartyHome(), "bin"), env) addClasspath(os.path.join(thirdPartyHome, "lib", "db.jar"), env) else: print("warning: could not detect Ice Third party installation.") |