bug 4527: PHP test script failure on Windows

1 files changed, 9 insertions, 5 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 1352121dcec..189735453a5 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -494,8 +494,12 @@ def phpSetup():
     #
     if isWin32():
         ext = "php_ice.dll"
-        extDir = os.path.abspath(os.path.join(getIceDir("php"), "lib"))
-        incDir = extDir
+        if not iceHome:
+            extDir = os.path.abspath(os.path.join(getIceDir("php"), "lib"))
+            incDir = extDir
+        else:
+            extDir = os.path.join(iceHome, "bin")
+            incDir = os.path.join(iceHome, "php")
     else:
         ext = "IcePHP.so"
         if not iceHome:
@@ -524,10 +528,10 @@ def phpSetup():
     tmpini = open("tmp.ini", "w")
     tmpini.write("; Automatically generated by Ice test driver.\n")
     if extDir:
-        tmpini.write("extension_dir=%s\n" % extDir)
+        tmpini.write("extension_dir=\"%s\"\n" % extDir)
         tmpini.write("extension=%s\n" % ext)
     if incDir:
-        tmpini.write("include_path=%s\n" % incDir)
+        tmpini.write("include_path=\"%s\"\n" % incDir)
     tmpini.close()
 
 def getIceVersion():
@@ -1303,7 +1307,7 @@ class PhpCleanup:
     def __del__(self):
         if os.path.exists("tmp.ini"):
             os.remove("tmp.ini")
-    
+
 # TODO: Perhaps this should be done when the tmp.ini file is created.
 try:
     lang = getDefaultMapping()