diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2015-04-14 10:32:53 -0230 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2015-04-14 10:32:53 -0230 |
commit | 4a32b447136a604c5e2f6323a3427ce6d52225dc (patch) | |
tree | e2f0e7e320956ef879f48ac97f82f8a34677a021 /scripts/TestUtil.py | |
parent | (ICE-6452) - C# nmake install doesn't work (diff) | |
download | ice-4a32b447136a604c5e2f6323a3427ce6d52225dc.tar.bz2 ice-4a32b447136a604c5e2f6323a3427ce6d52225dc.tar.xz ice-4a32b447136a604c5e2f6323a3427ce6d52225dc.zip |
ICE-6451 test/Slice/headers does not work against bindist
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-x | scripts/TestUtil.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 31b79671e31..ae87ebaaba8 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -665,6 +665,22 @@ def getIceDir(subdir = None, testdir = None): else: return toplevel +def getSliceDir(): + # + # If ICE_HOME is set we're running the test against a binary distribution. Otherwise, + # we're running the test against a source distribution. + # + global iceHome + if iceHome: + if isDarwin() and iceHome == "/usr/local": + return "/usr/local/share/slice" + elif isLinux() and iceHome == "/usr": + return "/usr/share/Ice-" + iceVersion + "/slice" + else: + return os.path.join(iceHome, "slice") + else: + return os.path.join(toplevel, "slice") + def phpCleanup(): if os.path.exists("tmp.ini"): os.remove("tmp.ini") |