diff options
| author | Joe George <joe@zeroc.com> | 2016-11-23 11:10:24 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-11-23 11:10:24 -0500 |
| commit | e824813e3d347fcdd09c85aff863af383919db4a (patch) | |
| tree | 32ba55f5b4e363f39503a7bd7ea73d14ac74bd99 /scripts/TestUtil.py | |
| parent | Update js dependencies (diff) | |
| download | ice-e824813e3d347fcdd09c85aff863af383919db4a.tar.bz2 ice-e824813e3d347fcdd09c85aff863af383919db4a.tar.xz ice-e824813e3d347fcdd09c85aff863af383919db4a.zip | |
Update directory TestUtil checks for slice files
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index ff62b0ed2e2..846d9975ce6 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -750,10 +750,8 @@ def getSliceDir(): # 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" + if iceHome == "/usr/local" or iceHome == "/usr": + return os.path.join(iceHome, "ice", "slice") else: return os.path.join(iceHome, "slice") else: |