diff options
| author | Joe George <joe@zeroc.com> | 2016-09-28 15:20:59 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-09-28 15:21:27 -0400 |
| commit | 66cfe95b99467416ce9d1d862e5ce39eafea1356 (patch) | |
| tree | 68e3bf4c632d51a19ccad1eed419b18ad9229d91 /scripts/TestUtil.py | |
| parent | PHP 7 in 3.6.3 (diff) | |
| download | ice-66cfe95b99467416ce9d1d862e5ce39eafea1356.tar.bz2 ice-66cfe95b99467416ce9d1d862e5ce39eafea1356.tar.xz ice-66cfe95b99467416ce9d1d862e5ce39eafea1356.zip | |
Additional fix for ICE-7386
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index be511edb9f2..831bc389b8f 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -752,7 +752,8 @@ def phpFlags(): else: ext += ".so" if not iceHome: - extDir = os.path.abspath(os.path.join(toplevel, "php", "lib")) + phpDir = lambda langDir: langDir if "php" in langDir else "php" + extDir = os.path.abspath(os.path.join(toplevel, phpDir(getDefaultMappingDir()), "lib")) incDir = extDir else: # |