PHP changes:

- static translation
- more traditional language mapping (multiple communicators, etc.)
- support for registered (persistent) communicators
- support for PHP namespaces (PHP 5.3 or later)

1 files changed, 27 insertions, 16 deletions

diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 3c2cbcc49fa..1bee4fd4937 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -421,9 +421,10 @@ def getIceDir(subdir = None):
     else: 
         return toplevel
 
-def writePhpIni(src, dst):
+def phpSetup():
     extDir = None
     ext = None
+    incDir = None
 
     #
     # TODO
@@ -436,7 +437,8 @@ def writePhpIni(src, dst):
     #
     if isWin32():
         ext = "php_ice.dll"
-        extDir = os.path.abspath(os.path.join(getIceDir("php"), "bin"))
+        extDir = os.path.abspath(os.path.join(getIceDir("php"), "lib"))
+        incDir = extDir
     else:
         ext = "IcePHP.so"
         if not iceHome:
@@ -460,16 +462,21 @@ def writePhpIni(src, dst):
                     print "unable to find IcePHP extension!"
                     sys.exit(1)
 
-    ini = open(src, "r").readlines()
-    for i in range(0, len(ini)):
-        ini[i] = ini[i].replace("ICE_HOME", os.path.join(toplevel))
-    tmpini = open(dst, "w")
-    tmpini.writelines(ini)
+        incDir = extDir
+
+    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=%s\n" % ext)
+    if incDir:
+        tmpini.write("include_path=%s\n" % incDir)
     tmpini.close()
 
+def phpCleanup():
+    if os.path.exists("tmp.ini"):
+        os.remove("tmp.ini")
+
 def getIceSoVersion():
 
     config = open(os.path.join(toplevel, "cpp", "include", "IceUtil", "Config.h"), "r")
@@ -791,7 +798,7 @@ def isDebug():
     return debug
 
 import Expect
-def spawn(cmd, env = None, cwd = None, startReader = True,lang=None):
+def spawn(cmd, env=None, cwd=None, startReader=True, lang=None):
     # Start/Reset the watch dog thread
     global watchDog
     if watchDog == None:
@@ -803,15 +810,15 @@ def spawn(cmd, env = None, cwd = None, startReader = True,lang=None):
         print "(%s)" % cmd,
     if printenv:
         dumpenv(env, lang)
-    return Expect.Expect(cmd, startReader = startReader, env = env, logfile=tracefile, cwd = cwd)
+    return Expect.Expect(cmd, startReader=startReader, env=env, logfile=tracefile, cwd=cwd)
 
-def spawnClient(cmd, env = None, cwd = None, echo = True, startReader = True,lang=None):
-    client = spawn(cmd, env, cwd, startReader = startReader,lang = lang)
+def spawnClient(cmd, env=None, cwd=None, echo=True, startReader=True, lang=None):
+    client = spawn(cmd, env, cwd, startReader=startReader, lang=lang)
     if echo:
         client.trace()
     return client
 
-def spawnServer(cmd, env = None, cwd = None, count = 1, adapter = None, echo = True, lang=None):
+def spawnServer(cmd, env=None, cwd=None, count=1, adapter=None, echo=True, lang=None):
     server = spawn(cmd, env, cwd, lang=lang)
     if adapter:
         server.expect("%s ready\n" % adapter)
@@ -888,6 +895,9 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "",
         if clientenv is None:
             clientenv = getTestEnv(clientLang, clientdir)
 
+        if lang == "php":
+            phpSetup()
+
         print "starting " + serverDesc + "...",
         serverCfg = DriverConfig("server")
         if lang in ["rb", "php"]:
@@ -896,9 +906,6 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "",
         serverProc = spawnServer(server, env = serverenv, lang=serverCfg.lang)
         print "ok"
 
-        if lang == "php":
-            writePhpIni("php.ini", "tmp.ini")
-
         if clientLang == lang:
             print "starting %s..." % clientDesc,
         else:
@@ -942,7 +949,7 @@ def startClient(exe, args = "", config=None, env=None, echo = True, startReader
         env = getTestEnv(getDefaultMapping(), os.getcwd())
     cmd = getCommandLine(exe, config) + ' ' + args
     if config.lang == "php":
-        writePhpIni("php.ini", "tmp.ini")
+        phpSetup()
     return spawnClient(cmd, env = env, echo = echo, startReader = startReader, lang=config.lang)
 
 def startServer(exe, args = "", config=None, env=None, adapter = None, count = 1, echo = True):
@@ -1057,6 +1064,10 @@ def cleanup():
         watchDog.join()
         watchDog = None
 
+    lang = getDefaultMapping()
+    if lang == "php":
+        phpCleanup()
+
 def processCmdLine():
     def usage():
         print "usage: " + sys.argv[0] + """