cygwin python is no longer required under Windows to run the expect scripts.

Numerous cleanups and bug fixes to the expect scripts.

The following bugs have been fixed:

http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3091 - under windows a timeout does not kill the spawned servers.
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3167 - cleanup IceBox expect scripts.
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3131 - demoscript environment setup.
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3130 - config/DemoUtil.py should be in demoscript.

Squashed commit of the following:

commit c82e5b70dab99b69caf4044341f6453e0a2b8192
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Wed Jun 11 14:42:34 2008 +0800

    fix bug with multicast demo script.

commit c6e61dddf2fc73088e5ecacd096c01fc30c5477a
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Wed Jun 11 14:14:52 2008 +0800

    guess the build mode if not set on the command line under Windows.

commit 6e797cdca50d6a30493f56e978da4b6f8a08e70d
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Jun 10 17:16:49 2008 +0800

    use dirname, not split.

commit 862fb56fac680d42037d251c54938ed294596690
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Jun 10 17:07:24 2008 +0800

    simplify environment setup.

commit d647b35588019ab841c5fe076950e7c19dcbf22c
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Jun 10 16:38:40 2008 +0800

    use iceHome not sourcedist in the environment setup.

commit 18a82ad794517406f80add4071f46848220bae27
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Tue Jun 10 16:00:49 2008 +0800

    fix another hasInterruptSupport problem.

commit 18b276f2c5dcf8a2c38c79e7dc8e8b5f20ce884e
Author: Matthew Newhook <matthew@centosvm4.matthew.zeroc.com>
Date:   Tue Jun 10 15:28:08 2008 +0800

    Fix printing of the environment.

commit 42d5f59dbd2db1811abdd759387e53081858edb0
Author: Matthew Newhook <matthew@centosvm4.matthew.zeroc.com>
Date:   Tue Jun 10 14:12:19 2008 +0800

    remove -u from iceca. Put another workaround in the makecerts script.

commit 1bfcc656f25ec3f4f49b5c534bd1c50d50801a4c
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Mon Jun 9 12:19:31 2008 +0800

    New method to find the top level directory.

commit 1c771768e29b7ff9d141b39f8e03b6790564b4ea
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Mon Jun 9 11:28:25 2008 +0800

    Print environment variables in a more sane manner. Don't add cs/bin to the PATH & java/lib to CLASSPATH if not using a source dist.

commit a477ceac74b04f297cb342bc7229e2a3a70695e1
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Jun 6 16:32:09 2008 +0800

    fix various problems when testing with the demo dist.

commit 9bdb41f02130a5716a52ea0ae161fd88697277e5
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Jun 6 13:35:41 2008 +0800

    Stop copying obsolete DemoUtil.py.

commit d1b4eabc643d0ea04374640ef3f3a2452aaa19bd
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Fri Jun 6 13:20:59 2008 +0800

    fix win32 problem.

commit f92d9bf033e253cb8e3ee8dbce1583c7a695ad9f
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Jun 6 13:08:27 2008 +0800

    more cleanups.

commit 8ecea1446b8a64afdf029f4e722d473c58149f84
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Jun 6 12:45:58 2008 +0800

    get rid of the processCmdLine.

commit a868ebcd7f868d7b9340f8df6d47ab87d43d37d3
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Jun 6 12:38:16 2008 +0800

    fix preamble.

commit 148f2922a794fa0ef696e8b4ba51749d4b15cb2c
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Fri Jun 6 12:30:07 2008 +0800

    fixed some errors in the scripts.

commit 3b9fb9a6b755fe3d84864cdd6853b2a59588a089
Author: Matthew Newhook <matthew@centosvm4.matthew.zeroc.com>
Date:   Thu Jun 5 14:47:39 2008 +0800

    python 2.3 support.

commit 56956b0a56dd2de5753db060bdadfdb4ddb242a8
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Jun 5 14:05:51 2008 +0800

    change setenv to addenv. Use hasInterruptSupport in Except.

commit e2907ffd17bc59eaa9d5dd74fb74dbb7ac9addba
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Jun 5 13:02:24 2008 +0800

    minor cleanup and optimizations.

commit 97fbc27302ee1f74572b634e3b7d4efe6654540f
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Jun 5 12:52:57 2008 +0800

    fix top level allDemos.

commit 04630047daffafe524e3aed7833dd48e82b90bf2
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Jun 5 12:39:57 2008 +0800

    Align scripts with the testsuite.

commit 2909a30d682cb6f9cb192f21bf652c3b8037371d
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Thu Jun 5 10:55:13 2008 +0800

    Some Win32 fixes.

commit bc760c357a33a11f3f645169c291c69e1f16fb43
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Wed Jun 4 18:03:12 2008 +0800

    lots of cleanups.

commit c69fbac2457b5a14cc8a48beae3381652f50f599
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Tue Jun 3 16:54:45 2008 +0800

    fix some python problems.

commit 326a95af7c720c0c740975c11251feb2f9b4762b
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Jun 3 16:16:13 2008 +0800

    use python -u for iceca.

commit 990c03c6d314c7d95137a69ebce03425e0eff56c
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Jun 3 14:47:00 2008 +0800

    first set of unix changes.

commit aa02eaec6c5d44d526b3236908a53c855754217c
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Tue Jun 3 14:46:51 2008 +0800

    Get rid of \r in the input stream. Fix scripts accordingly. Fix signal handling under windows.

commit 558015fb4131980f1f4b3fa23c3ddf366d186d20
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Mon Jun 2 16:38:21 2008 +0800

    fix signal handling.

commit cadfb7bcabb4c68317fc77c9076607dfb2201e2b
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Fri May 30 17:40:38 2008 +0800

    working on a fix for hanging.

commit 9b9ffa736d1540c8bfdaa3693df3022e6377cdec
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Thu May 29 17:53:11 2008 +0800

    Removed dependence on cygwin.

commit cce2d732036585fe8e34f92d6b75ae9c27465622
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Thu May 29 16:17:42 2008 +0800

    windows expect script changes.

1 files changed, 531 insertions, 171 deletions

diff --git a/demoscript/Util.py b/demoscript/Util.py
index 871a857a117..cc6fea056dd 100755
--- a/demoscript/Util.py
+++ b/demoscript/Util.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # **********************************************************************
 #
 # Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
@@ -8,20 +7,20 @@
 #
 # **********************************************************************
 
+import os
 import sys
-if sys.platform == "win32":
-    print "demoscript only supports cygwin python under Windows (use /usr/bin/python expect.py)"
-    sys.exit(1)
+import getopt
+import re
+import os
+import signal
+import time
+import Expect
 
-#
-# Timeout after the initial spawn.
-#
-initialTimeout = 10
-
-#
-# Default timeout on subsequent expect calls.
-#
-defaultTimeout = 5
+keepGoing = False
+iceHome = None
+x64 = False
+toplevel = None
+demoErrors = []
 
 #
 # Default value of --Ice.Default.Host
@@ -33,171 +32,443 @@ host = "127.0.0.1"
 #
 debug = False
 
-#
-# The test language.
-#
-defaultLanguage = None
-
-import getopt, os, signal
-import demoscript.pexpect as pexpect
-
-def usage():
-    print "usage: " + sys.argv[0] + " --x64 --fast --trace --debug --host host --mode=[debug|release] --python=<path>"
-    sys.exit(2)
-try:
-    opts, args = getopt.getopt(sys.argv[1:], "", ["x64", "fast", "trace", "debug", "host=", "mode=", "python="])
-except getopt.GetoptError:
-    usage()
-
-fast = False
-trace = False
-mode = 'release'
-x64 = False
-pythonhome = "/cygdrive/c/python25"
-for o, a in opts:
-    if o == "--debug":
-        debug = True
-    if o == "--trace":
-        trace = True
-    if o == "--host":
-        host = a
-    if o == "--fast":
-        fast = True
-    if o == "--x64":
-        x64 = True
-    if o == "--python":
-        pythonhome = a
-    if o == "--mode":
-        mode = a
-        if mode != 'debug' and mode != 'release':
-            usage()
-
-if host != "":
-    defaultHost = " --Ice.Default.Host=%s" % (host)
+# Locate the top level directory of the demo dist (or the top of the
+# source tree for a source dist).
+path = [ ".", "..", "../..", "../../..", "../../../.." ]
+head, tail = os.path.split(sys.argv[0])
+if len(head) > 0:
+    path = [os.path.join(head, p) for p in path]
+path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "demoscript")) ]
+toplevel = path[0]
+if os.path.isdir(os.path.join(toplevel, "cpp")):
+    sourcedist = True
 else:
-    defaultHost = None
+    sourcedist = False
 
-def isCygwin():
-    # The substring on sys.platform is required because some cygwin
-    # versions return variations like "cygwin_nt-4.01".
-    return sys.platform[:6] == "cygwin"
+origenv = {}
+def dumpenv():
+    print "the following environment variables have been set:"
+    for k, v in origenv.iteritems():
+        added = os.environ[k][:len(os.environ[k])-len(v)]
+	if len(v) > 0:
+	    if isWin32():
+		print "%s=%s%%%s%%" % (k, added, k)
+	    else:
+		print "%s=%s$%s" % (k, added, k)
+	else:
+		print "%s=%s" % (k, added)
+
+def addenv(var, val):
+    global origenv
+    if not var in origenv:
+        origenv[var] = os.environ.get(var, "")
+    if var in os.environ:
+        os.environ[var] = "%s%s%s" % (val, os.pathsep, os.environ.get(var, ""))
+    else:
+        os.environ[var] = val
+
+def configurePaths():
+
+    if iceHome:
+        print "[ using Ice installation from " + iceHome,
+        if x64:
+            print "(64bit)",
+        print "]"
+
+    #
+    # If Ice is installed from RPMs, just set the CLASSPATH for Java.
+    #
+    if iceHome == "/usr":
+        javaDir = os.path.join("/", "usr", "share", "java")
+        addenv("CLASSPATH", os.path.join(javaDir, "Ice.jar"))
+        addenv("CLASSPATH", "classes")
+        return # That's it, we're done!
+
+    binDir = os.path.join(getIceDir("cpp"), "bin")        
+    shlibVar = None
+    libDir = None
+    if not isWin32():
+        libDir = os.path.join(getIceDir("cpp"), "lib")
+
+    # 64-bits binaries are located in a subdirectory with binary
+    # distributions.
+    if iceHome and x64: 
+        if isWin32():
+            binDir = os.path.join(binDir, "x64")
+        elif isHpUx():
+            libDir = os.path.join(libDir, "pa20_64")
+            binDir = os.path.join(binDir, "pa20_64")
+        elif isSolaris():
+            if isSparc():
+                libDir = os.path.join(libDir, "sparcv9")
+                binDir = os.path.join(binDir, "sparcv9")
+            else:
+                libDir = os.path.join(libDir, "amd64")
+                binDir = os.path.join(binDir, "amd64")
+        else:
+            libDir = libDir + "64"
+            binDir = binDir + "64"
+
+    # Only add the lib directory to the shared library path if we're
+     # not using the embedded location.
+    if libDir and iceHome != "/opt/Ice-3.3":
+        addLdPath(libDir)
+
+    if not iceHome:
+        addenv("PATH", os.path.join(getIceDir("cs"), "bin"))
+    addenv("PATH", binDir)
+
+    javaDir = getIceDir("java")
+
+    addenv("CLASSPATH", os.path.join(javaDir, "lib", "Ice.jar"))
+    if not iceHome:
+        addenv("CLASSPATH", os.path.join(javaDir, "lib"))
+    addenv("CLASSPATH", os.path.join("classes"))
+
+    # 
+    # On Windows, C# assemblies are found thanks to the .exe.config files.
+    #
+    if not isWin32():
+        addenv("MONO_PATH", os.path.join(getIceDir("cs"), "bin"))
+
+    #
+    # On Windows x64, set PYTHONPATH to python/x64.
+    #
+    if isWin32() and x64:
+        addenv("PYTHONPATH", os.path.join(getIceDir("py"), "python", "x64"))
+    else:
+        addenv("PYTHONPATH", os.path.join(getIceDir("py"), "python"))
+    addenv("RUBYLIB", os.path.join(getIceDir("rb"), "ruby"))
+
+# Mapping to the associated subdirectory.
+mappingDirs = {
+    "cpp" : ( os.path.join("cpp", "demo"), "demo"),
+    "java" : ( os.path.join("java", "demo"), "demoj"),
+    "cs" : ( os.path.join("cs", "demo"), "democs"),
+    "vb" : ( os.path.join("vb", "demo"), "demovb"),
+    "py" : ( os.path.join("py", "demo"), "demopy"),
+    "rb" : ( os.path.join("rb", "demo"), "demorb"),
+    "php" : ( os.path.join("php", "demo"), "demophp"),
+}
+
+def getMappingDir(suffix, mapping):
+    """Get the directory containing the demos for the given mapping."""
+    # In the source tree
+    if sourcedist:
+        return mappingDirs[mapping][0]
+    else:
+        return mappingDirs[mapping][1]
+
+def getMirrorDir(mapping = None):
+    """Get the mirror directory for the current demo in the given mapping."""
+    here = os.path.abspath(os.getcwd())
+
+    # Split off the front portion portion
+    pref = here[:len(toplevel)]
+    assert pref == toplevel
+    post = here[len(toplevel)+1:]
+
+    # In the source tree
+    if sourcedist:
+        scriptPath = os.path.join(post.split(os.sep)[2:])
+        mappingDir = mappingDirs[mapping][0]
+    else:
+        scriptPath = os.path.join(post.split(os.sep)[1:])
+        mappingDir = mappingDirs[mapping][1]
+    return os.path.join(pref, mappingDir, *scriptPath)
+
+def getIceDir(subdir = None):
+    """Get the top level directory of the ice distribution.  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:
+        return iceHome
+    elif subdir:
+        return os.path.join(toplevel, subdir)
+    else:
+        return toplevel
+
+def isWin32():
+    return sys.platform == "win32"
+
+def isHpUx():
+   return sys.platform == "hp-ux11"
+
+def isSolaris():
+    return sys.platform == "sunos5"
+
+def isSparc():
+    p = os.popen("uname -m")
+    l = p.readline().strip()
+    if l == "sun4u":
+        return True
+    else:
+        return False
+
+def isAIX():
+   return sys.platform in ['aix4', 'aix5']
 
 def isDarwin():
    return sys.platform == "darwin"
 
+def isLinux():
+    return sys.platform.startswith("linux")
+
 def isMono():
-    return not isCygwin()
+    return not isWin32()
 
 def isSolaris():
     return sys.platform == "sunos5"
 
-def python():
-    if isCygwin():
-        return "%s/python -u " % pythonhome
+def getMapping():
+    """Determine the current mapping based on the cwd."""
+    here = os.path.abspath(os.getcwd())
+    assert here[:len(toplevel)] == toplevel
+    dir = here[len(toplevel)+1:].split(os.sep)[0]
+
+    if sourcedist:
+        mapping = { "cpp": "cpp", "cs": "cs", "java": "java", "php": "php", "py": "py", "rb": "rb", "vb": "vb" }
     else:
-        return "python "
-
-def cygpath(path):
-    if not isCygwin():
-	return path
-    child = os.popen("cygpath -w %s" % path)
-    path = child.read().strip()
-    err = child.close()
-    if err:
-	raise "cygpath failed"
-    return path
-
-def getIceBox():
-    if isCygwin():
-        if mode == 'release':
-            return "icebox"
+        mapping = { "demo": "cpp", "democs": "cs", "demoj": "java", "demophp": "php", "demopy": "py",
+                    "demorb": "rb", "demovb": "vb" }
+    return mapping[dir]
+
+def runDemos(start, args, demos, num = 0, script = False, root = False):
+    global demoErrors
+    global keepGoing
+
+    total = len(demos)
+
+    #
+    # Run each of the demos.
+    #
+    index = 0
+    for i in demos:
+        index = index + 1
+        if index < start:
+            continue
+
+        i = os.path.normpath(i)
+        if root:
+            dir = os.path.join(toplevel, i)
         else:
-            return "iceboxd"
-    return "icebox"
-
-# Automatically adds default host, and uses our default timeout for
-# expect.
-class spawn(pexpect.spawn):
-    def __init__(self, command, language = None):
-        if defaultHost:
-            command = '%s %s' % (command, defaultHost)
-        if not language:
-            self.language = defaultLanguage
+            dir = os.path.join(toplevel, getMappingDir(toplevel, getMapping()), i)
+
+        if script:
+            prefix = "echo \""
+            suffix = "\""
         else:
-            self.language = language
-        self.expectFirst = True
-        if trace:
-            logfile = sys.stdout
+            prefix = ""
+            suffix = ""
+
+        print
+        if(num > 0):
+            print "[" + str(num) + "]",
+        print "%s*** running demo %d/%d in %s%s" % (prefix, index, total, dir, suffix)
+        print "%s*** configuration:" % prefix,
+        if len(args.strip()) == 0:
+            print "Default",
         else:
-            logfile = None
-        self.sentKill = None
-        if self.language == "C#":
-            if isMono():
-                command = "mono " + command
-            else:
-                command = "./" + command
-        if self.language == "Python":
-            command = python() + command
-        if self.language == "VB":
-            command = "./" + command
-        if self.language == "Java":
-            if isSolaris() and x64:
-                command = command.replace("java", "java -d64")
-        if debug:
-            print '(%s)' % (command)
-        pexpect.spawn.__init__(self, command, logfile = logfile)
-
-    def expect(self, pattern, timeout = defaultTimeout, searchwindowsize=None):
-        if self.expectFirst and timeout == defaultTimeout:
-            timeout = initialTimeout
-            self.expectFirst = False
-        if trace:
-           print "(expect: %s timeout=%d)" % (pattern, defaultTimeout)
-        return pexpect.spawn.expect(self, pattern, timeout, searchwindowsize)
-
-    def wait(self):
-        try:
-            return pexpect.spawn.wait(self)
-        except pexpect.ExceptionPexpect, e:
-            return self.exitstatus
-
-    def kill(self, sig):
-        if isCygwin():
-            sig = signal.SIGTERM
-        self.sentKill = sig
-        return pexpect.spawn.kill(self, sig)
-    
-    # status == 0 is normal exit status for C++
-    #
-    # status == 130 is normal exit status for a Java app that was
-    # SIGINT interrupted.
-    #
-    # signalstatus == SIGINT is normal exit status for a mono app,
-    # or if under cygwin (since cygwin spawned expect apps cannot
-    # catch SIGINT).
-    #
-    def waitTestSuccess(self, exitstatus = 0, timeout = None):
-        if not timeout:
-            self.expect(pexpect.EOF)
+            print args.strip(),
+        print suffix
+
+        if script:
+            print "echo \"*** demo started: `date`\""
+            print "cd %s" % dir
         else:
-            self.expect(pexpect.EOF, timeout)
-        status = self.wait()
-        if self.language != "Java":
-            if isCygwin() and self.sentKill:
-                assert self.signalstatus == self.sentKill
-            else:
-                assert status == exitstatus
-        else: # self.language == "Java":
-            if self.sentKill:
-                if isCygwin():
-                    assert self.signalstatus == self.sentKill
+            print "*** demo started:", time.strftime("%x %X")
+            sys.stdout.flush()
+            os.chdir(dir)
+
+        if script:
+            print "if ! python %s %s; then" % (os.path.join(dir, "expect.py"), args)
+            print "  echo 'demo in %s failed'" % os.path.abspath(dir)
+            if not keepGoing:
+                print "  exit 1"
+            print "fi"
+        else:
+            status = os.system("python " + os.path.join(dir, "expect.py " + args))
+
+            if status:
+                if(num > 0):
+                    print "[" + str(num) + "]",
+                message = "demo in " + dir + " failed with exit status", status,
+                print message
+                if keepGoing == False:
+                    print "exiting"
+                    sys.exit(status)
                 else:
-                    if self.sentKill == signal.SIGINT:
-                        assert status == 130
-                    else:
-                        assert False
+                    print " ** Error logged and will be displayed again when suite is completed **"
+                    demoErrors.append(message)
+
+
+def run(demos, root = False):
+    def usage():
+        print """usage: %s
+        --start=index           Start running the demos at the given demo."
+        --loop                  Run the demos in a loop."
+        --filter=<regex>        Run all the demos that match the given regex."
+        --rfilter=<regex>       Run all the demos that do not match the given regex."
+        --debug                 Display debugging information on each demos."
+        --trace=<output>        Run the demos with tracing enabled."
+        --host=host             Set --Ice.Default.Host=<host>."
+        --mode=debug|release    Run the demos with debug or release mode builds (win32 only)."
+        --continue              Keep running when a demo fails."
+        --ice-home=<path>       Use the binary distribution from the given path."
+        --x64                   Binary distribution is 64-bit."
+        --fast                  Run an abbreviated version of the demos."
+        --script                Generate a script to run the demos.
+        --env                   Dump the environment.""" % (sys.argv[0])
+        sys.exit(2)
+
+    global keepGoing 
+
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "lr:R:", [
+                "filter=", "rfilter=", "start=", "loop", "fast", "trace=", "debug", "host=", "mode=",
+                "continue", "ice-home=", "x64", "env", "script"])
+    except getopt.GetoptError:
+        usage()
+
+    # Extra args cause a usage error.
+    if args:
+        usage()
+
+    start = 0
+    loop = False
+    env = False
+    arg = ""
+    filters = []
+    script = False
+    for o, a in opts:
+        if o in ("-l", "--loop"):
+            loop = True
+        elif o == "--x64":
+            global x64
+            x64 = True
+            arg += " " + o
+        elif o == "--env":
+            env = True
+            arg += " " + o
+        elif o in ("-c", "--continue"):
+            keepGoing = True
+        elif o in ("-r", "-R", "--filter", '--rfilter'):
+            if o in ("--rfilter", "-R"):
+                filters.append((re.compile(a), True))
             else:
-                assert status == exitstatus
+                filters.append((re.compile(a), False))
+        elif o in ("--host", "--fast", "--trace", "--debug", "--mode", "--ice-home"):
+            if o == "--mode":
+                if a not in ( "debug", "release"):
+                    usage()
+            arg += " " + o
+            if len(a) > 0:
+                arg += " " + a
+        elif o in '--start':
+            start = int(a)
+        elif o in '--script':
+            script = True
+
+    for demoFilter, removeFilter in filters:
+        if removeFilter:
+            demos = [ x for x in demos if not demoFilter.search(x) ]
+        else:
+            demos = [ x for x in demos if demoFilter.search(x) ]
+
+    if loop:
+        num = 1
+        while 1:
+            runDemos(start, arg, demos, num, script = script, root = root)
+            num += 1
+    else:
+        runDemos(start, arg, demos, script = script, root = root)
+
+    if len(demoErrors) > 0:
+        print "The following errors occurred:"
+        for x in demoErrors:
+            print x
+
+def guessModeForDir(cwd):
+    import glob
+    debugDll = glob.glob(os.path.join(cwd, "*d.dll"))
+    # *.dll includes d.dll, so do an intersection on the set.
+    dll = [p for p in glob.glob(os.path.join(cwd, "*.dll")) if not p in debugDll ]
+    if len(debugDll) > 0 and len(dll) == 0:
+        return "debug"
+    if len(dll) > 0 and len(debugDll) == 0:
+        return "release"
+    if len(dll) > 0 and len(debugDll) > 0:
+        # Find out which is newer.
+        if os.stat(dll[0]).st_ctime > os.stat(debugDll[0]).st_ctime:
+            return "release"
+        else:
+            return "debug"
+    return None
+
+def guessMode():
+    m = guessModeForDir(".")
+    if m is None and not iceHome and sourcedist:
+        m = guessModeForDir(os.path.join(toplevel, "cpp", "bin"))
+    if m is None:
+        raise "cannot guess debug or release mode"
+    return m
+        
+def getIceBox(mapping = "cpp"):
+    if mapping == "cpp":
+        if isWin32():
+            global mode
+            # Guess the mode, if not set on the command line.
+            if mode is None:
+                mode = guessMode()
+                print "(guessed build mode %s)" % mode
+            if mode == 'release':
+                return "icebox"
+            else:
+                return "iceboxd"
+        return "icebox"
+    elif mapping == "cs":
+        if isMono(): # Mono cannot locate icebox in the PATH.
+            # This is wrong for a demo dist.
+            return os.path.join(getIceDir("cs"), "bin", "iceboxnet.exe")
+        else:
+            return "iceboxnet.exe"
+    assert False
+
+def spawn(command, cwd = None):
+    desc = command.split(' ')[0]
+
+    if defaultHost:
+        command = '%s %s' % (command, defaultHost)
+
+    # magic
+    knownCommands = [ "icegridnode", "icegridregistry", "icebox", "iceboxd", "icegridadmin", "icestormadmin",
+                      "iceboxadmin", "transformdb", "glacier2router" ]
+    if desc in knownCommands:
+        mapping = "cpp"
+    else:
+        mapping = getMapping()
+
+    if mapping == "cs":
+        if isMono():
+            command = "mono " + command
+        else:
+            command = "./" + command
+    elif mapping == "py":
+        command = "python -u " + command
+    elif mapping == "vb":
+        command = "./" + command
+    elif mapping == "java":
+        if isSolaris() and x64:
+            command = command.replace("java", "java -d64")
+
+    if debug:
+        print '(%s)' % (command)
+    if isWin32(): # Under Win32 ./ does not work.
+        command = command.replace("./", "")
+
+    return Expect.Expect(command, logfile = tracefile, desc = desc, mapping = mapping, cwd = cwd)
 
 def cleanDbDir(path):
     for filename in [ os.path.join(path, f) for f in os.listdir(path) if f != ".gitignore" and f != "DB_CONFIG"]:
@@ -213,15 +484,104 @@ def cleanDbDir(path):
             os.remove(filename)
 
 def addLdPath(libpath):
-    if sys.platform == "win32":
-        os.environ["PATH"] = libpath + os.pathsep + os.getenv("PATH", "")
-    elif sys.platform == "hp-ux11":
-        os.environ["SHLIB_PATH"] = libpath + os.pathsep + os.getenv("SHLIB_PATH", "")
-        os.environ["LD_LIBRARY_PATH"] = libpath + os.pathsep + os.getenv("LD_LIBRARY_PATH", "")
-    elif sys.platform == "darwin":
-        os.environ["DYLD_LIBRARY_PATH"] = libpath + os.pathsep + os.getenv("DYLD_LIBRARY_PATH", "")
-    elif sys.platform in ['aix4', 'aix5']:
-        os.environ["LIBPATH"] = libpath + os.pathsep + os.getenv("LIBPATH", "")
+    if isWin32():
+        addenv("PATH", libpath)
+    elif isHpUx():
+        if x64:
+            addenv("LD_LIBRARY_PATH", libpath)
+        else:
+            addenv("SHLIB_PATH", libpath)
+    elif isDarwin():
+        addenv("DYLD_LIBRARY_PATH", libpath)
+    elif isAIX():
+        addenv("LIBPATH", libpath)
+    elif isSolaris():
+        if x64:
+            addenv("LD_LIBRARY_PATH_64", libpath)
+        else:
+            addenv("LD_LIBRARY_PATH", libpath)
+    else:
+        if x64:
+            addenv("LD_LIBRARY_PATH_64", libpath)
+        else:
+            addenv("LD_LIBRARY_PATH", libpath)
+
+def processCmdLine():
+    def usage():
+	print "usage: " + sys.argv[0] + " --x64 --env --fast --trace=output --debug --host host --mode=[debug|release] --ice-home=<dir>"
+	sys.exit(2)
+    try:
+	opts, args = getopt.getopt(sys.argv[1:], "", ["env", "x64", "fast", "trace=", "debug", "host=", "mode=", "ice-home="])
+    except getopt.GetoptError:
+	usage()
+
+    global fast
+    global defaultHost
+    global tracefile
+    global mode
+    global x64
+    global debug
+    global host
+    global iceHome
+
+    fast = False
+    trace = False
+    mode = None
+    x64 = False
+    tracefile = None
+    env = False
+
+    for o, a in opts:
+	if o == "--debug":
+	    debug = True
+	if o == "--trace":
+	    if a == "stdout":
+		tracefile = sys.stdout
+	    else:
+		tracefile = open(a, "w")
+	if o == "--host":
+	    host = a
+	if o == "--env":
+	    env = True
+	if o == "--fast":
+	    fast = True
+	if o == "--x64":
+	    x64 = True
+        if o == "--ice-home":
+            iceHome = a
+	if o == "--mode":
+	    mode = a
+	    if mode != 'debug' and mode != 'release':
+		usage()
+
+    if host != "":
+	defaultHost = " --Ice.Default.Host=%s" % (host)
+    else:
+	defaultHost = None
+
+    if not iceHome and os.environ.get("USE_BIN_DIST", "no") == "yes" or os.environ.get("ICE_HOME", "") != "":
+        if not os.environ.get("ICE_HOME", None):
+            iceHome = os.environ["ICE_HOME"]
+        elif isLinux():
+            iceHome = "/usr"
+
+    if not x64:
+        x64 = isWin32() and os.environ.get("XTARGET") == "x64" or os.environ.get("LP64") == "yes"
+
+    configurePaths()
+    if env:
+        dumpenv()
+
+import inspect
+frame = inspect.currentframe().f_back
+if frame and os.path.split(frame.f_code.co_filename)[1] == "expect.py":
+    # If we're not in the demo directory, chdir to the correct
+    # location.
+    if not os.path.isabs(sys.argv[0]):
+        d = os.path.join(os.getcwd(), sys.argv[0])
     else:
-        os.environ["LD_LIBRARY_PATH"] = libpath + os.pathsep + os.getenv("LD_LIBRARY_PATH", "")
-        os.environ["LD_LIBRARY_PATH_64"] = libpath + os.pathsep + os.getenv("LD_LIBRARY_PATH_64", "")
+        d = sys.argv[0]
+    d = os.path.split(d)[0]
+    if os.path.normpath(d) != os.getcwd():
+        os.chdir(d)
+    processCmdLine()