1 files changed, 2 insertions, 118 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py
index 818c5a98ed0..019f7cb67eb 100755
--- a/cpp/allTests.py
+++ b/cpp/allTests.py
@@ -20,32 +20,6 @@ else:
 sys.path.append(os.path.join(toplevel, "config"))
 import TestUtil
 
-def runTests(args, tests, num = 0):
-    #
-    # Run each of the tests.
-    #
-    for i in tests:
-
-        i = os.path.normpath(i)
-        dir = os.path.join(toplevel, TestUtil.getDefaultMapping(), "test", i)
-
-        print
-        if num > 0:
-            print "[" + str(num) + "]",
-        print "*** running tests in " + dir,
-        print
-
-        if TestUtil.isWin9x():
-            status = os.system("python " + os.path.join(dir, "run.py " + args))
-        else:
-            status = os.system(os.path.join(dir, "run.py " + args))
-
-        if status:
-            if(num > 0):
-                print "[" + str(num) + "]",
-            print "test in " + dir + " failed with exit status", status,
-            sys.exit(status)
-
 #
 # List of all basic tests.
 #
@@ -118,95 +92,5 @@ if TestUtil.isCygwin() == 0:
 if TestUtil.isWin32():
     tests.insert(0, "IceUtil/condvar")
 
-def usage():
-    print "usage: %s " % (sys.argv[0])
-    print "  --all                   Run all permutations of the tests."
-    print "  --start=<regex>         Start running the tests at the given test."
-    print "  --start-after=<regex>   Start running the tests after the given test."
-    print "  --loop                  Run the tests in a loop."
-    print "  --filter=<regex>        Run all the tests that match the given regex."
-    print "  --rfilter=<regex>       Run all the tests that do not match the given regex."
-    print "  --debug                 Display debugging information on each test."
-    print "  --protocol=tcp|ssl      Run with the given protocol."
-    print "  --compress              Run the tests with protocol compression."
-    print "  --host=host             Set --Ice.Default.Host=<host>."
-    print "  --threadPerConnection   Run with thread-per-connection concurrency model."
-    sys.exit(2)
-
-try:
-    opts, args = getopt.getopt(sys.argv[1:], "lr:R:",
-        ["start=", "start-after=", "filter=", "rfilter=", "all", "loop", "debug", "protocol=",
-         "compress", "host=", "threadPerConnection"])
-except getopt.GetoptError:
-    usage()
-
-# Extra args cause a usage error.
-if args:
-    usage()
-
-def index(l, re):
-    """Find the index of the first item in the list that matches the given re"""
-    for i in range(0, len(l)):
-        if re.search(l[i]):
-            return i
-    return -1
-
-# Process the command line args.
-loop = False
-arg = ""
-all = False
-for o, a in opts:
-    if o in ("-l", "--loop"):
-        loop = True
-    elif o in ("-r", "-R", "--filter", '--rfilter'):
-        regexp = re.compile(a)
-        if o in ("--rfilter", "-R"):
-            tests = [ x for x in tests if not regexp.search(x) ]
-        else:
-            tests = [ x for x in tests if regexp.search(x) ]
-    elif o == "--all" :
-        all = True
-    elif o in ( "--protocol", "--host", "--debug", "--compress", "--threadPerConnection" ):
-        if o == "--protocol":
-            if a not in ( "ssl", "tcp"):
-                usage()
-        arg += " " + o
-        if len(a) > 0:
-            arg += " " + a
-    elif o in ('--start', "--start-after"):
-        start = index(tests, re.compile(a))
-        if start == -1:
-            print "test %s not found. no tests to run" % (a)
-            sys.exit(2)
-        if o == "--start-after":
-            start += 1
-        tests = tests[start:]
-
-args = []
-if all and len(arg) > 0:
-    usage()
-
-if all:
-    for protocol in ["ssl", "tcp"]:
-        for compress in [0, 1]:
-            for threadPerConnection in [0, 1]:
-                arg = ""
-                if compress:
-                    arg += "--compress"
-                if threadPerConnection:
-                    arg += " --threadPerConnection"
-                arg += " --protocol %s" % (protocol)
-                args.append(arg)
-else:
-    args.append(arg)
-
-# Run the tests.
-if loop:
-    num = 1
-    while 1:
-        for arg in args:
-            runTests(arg, tests, num)
-        num += 1
-else:
-    for arg in args:
-        runTests(arg, tests)
+if __name__ == "__main__":
+    TestUtil.run(tests)