diff options
204 files changed, 348 insertions, 184 deletions
diff --git a/allTests.py b/allTests.py index 583d7517a24..dd446b65c47 100644 --- a/allTests.py +++ b/allTests.py @@ -22,8 +22,8 @@ for d in [ "cpp", "java", "cs", "py", "rb", "php" ]: current_mod = imp.load_module("allTests", f, filename, (".py", "r", imp.PY_SOURCE)) f.close() - tests = TestUtil.getTestSet([ os.path.join(d, "test", x) for x in current_mod.tests ]) + tests = [ os.path.join(d, "test", x) for x in current_mod.tests ] if len(tests) > 0: testGroups.extend(tests) -TestUtil.rootRun(testGroups) +TestUtil.run(testGroups, root=True) diff --git a/config/TestUtil.py b/config/TestUtil.py index db8ae3a03c1..00183b10e1e 100755 --- a/config/TestUtil.py +++ b/config/TestUtil.py @@ -8,13 +8,10 @@ # # ********************************************************************** -# -# TestUtil global flags section! -# -# You can modify the following variables to control which tests are run -# by default. Command line options provided at runtime will override -# these values. -# +import sys, os, re, errno, getopt, time, StringIO +from threading import Thread + +# Global flags and their default values. protocol = "" # If unset, default to TCP. Valid values are "tcp" or "ssl". compress = 0 # Set to 1 to enable bzip2 compression. threadPerConnection = 0 # Set to 1 to have tests use thread per connection concurrency model. @@ -27,12 +24,6 @@ ipv6 = 0 # Default to use IPv4 only javaCmd = "java" # Default java loader phpCmd = "php" # Name of default php binary (usually php or php5) -################################################################################ -# -# End of global flags section. Do not edit beyond this point. -# -################################################################################ - # # This is set by the choice of init method. If not set, before it is # used, it indicates a bug and things should terminate. @@ -41,25 +32,6 @@ defaultMapping = None testErrors = [] -import sys, os, re, errno, getopt, time, StringIO -from threading import Thread - -usageMessage = "usage: " + sys.argv[0] + """ - --all Run all permutations of the tests. - --start=<regex> Start running the tests at the given test. - --start-after=<regex> Start running the tests after the given test. - --loop Run the tests in a loop. - --filter=<regex> Run all the tests that match the given regex. - --rfilter=<regex> Run all the tests that do not match the given regex. - --debug Display debugging information on each test. - --protocol=tcp|ssl Run with the given protocol. - --compress Run the tests with protocol compression. - --host=host Set --Ice.Default.Host=<host>. - --threadPerConnection Run with thread-per-connection concurrency model. - --continue Keep running when a test fails - --ipv6 Use IPv6 addresses. -""" - def configurePaths(): toplevel = findTopLevel() @@ -134,11 +106,6 @@ def isAIX(): def isDarwin(): return sys.platform == "darwin" -def usage(): - global usageMessage - print usageMessage - sys.exit(2) - 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)): @@ -146,18 +113,81 @@ def index(l, re): return i return -1 -def getTestSet(tests): - resultSet = tests[start:] +def run(tests, root = False): + def usage(): + print "usage: " + sys.argv[0] + """ + --all Run all permutations of the tests. + --start=<regex> Start running the tests at the given test. + --start-after=<regex> Start running the tests after the given test. + --loop Run the tests in a loop. + --filter=<regex> Run all the tests that match the given regex. + --rfilter=<regex> Run all the tests that do not match the given regex. + --debug Display debugging information on each test. + --protocol=tcp|ssl Run with the given protocol. + --compress Run the tests with protocol compression. + --host=host Set --Ice.Default.Host=<host>. + --threadPerConnection Run with thread-per-connection concurrency model. + --continue Keep running when a test fails + --ipv6 Use IPv6 addresses. + --mono Use mono when running C# tests. + """ + 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", "continue", "ipv6", + "mono"]) + except getopt.GetoptError: + usage() + + if args: + usage() + + testFilter = None + removeFilter = False + start = 0 + loop = False + all = False + arg = "" + + for o, a in opts: + if o == "--continue": + keepGoing = 1 + elif o in ("-l", "--loop"): + loop = True + elif o in ("-r", "-R", "--filter", '--rfilter'): + testFilter = re.compile(a) + if o in ("--rfilter", "-R"): + removeFilter = True + elif o == "--all" : + all = True + 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:] + elif o == "--protocol": + if a not in ( "ssl", "tcp"): + usage() + + if o in ( "--protocol", "--host", "--debug", "--compress", "--threadPerConnection", "--ipv6", "--mono"): + arg += " " + o + if len(a) > 0: + arg += " " + a + + if all and len(arg) > 0: + usage() + if testFilter != None: if removeFilter: - resultSet = [ x for x in tests if not testFilter.search(x) ] + tests = [ x for x in tests if not testFilter.search(x) ] else: - resultSet = [ x for x in tests if testFilter.search(x) ] - return resultSet + tests = [ x for x in tests if testFilter.search(x) ] -def run(tests): - global arg - testset = getTestSet(tests) args = [] if all: for proto in ["ssl", "tcp"]: @@ -173,42 +203,17 @@ def run(tests): else: args.append(arg) + if not root: + tests = [ os.path.join(getDefaultMapping(), "test", x) for x in tests ] + if loop: num = 1 while 1: for arg in args: - runTests(arg, [ os.path.join(getDefaultMapping(), "test", x) for x in testset ], num) + runTests(arg, tests, num) num += 1 else: for arg in args: - runTests(arg, [ os.path.join(getDefaultMapping(), "test", x) for x in testset ]) - - global testErrors - if len(testErrors) > 0: - print "The following errors occurred:" - for x in testErrors: - print x - -def rootRun(tests): - global arg - if loop: - print "Looping is currently disabled for running all tests from the root!" - else: - if all: - for proto in ["ssl", "tcp"]: - for compress in [0, 1]: - for threadPerConnection in [0, 1]: - testarg = "" - if compress: - testarg += "--compress" - if threadPerConnection: - testarg += " --threadPerConnection" - testarg += " --protocol %s" % (proto) - args.append(testarg) - else: - args.append(arg) - - for arg in args: runTests(arg, tests) global testErrors @@ -249,6 +254,7 @@ def getIceCppDir(): findTopLevel() configurePaths() + serverPids = [] serverThreads = [] allServerThreads = [] @@ -541,36 +547,6 @@ def printOutputFromPipe(pipe): break os.write(1, c) -def commonInit(): - configurePaths() - -def javaInit(): - commonInit() - -def cppInit(): - commonInit() - -def pythonInit(): - commonInit() - -def rubyInit(): - commonInit() - -def dotnetInit(): - global usageMessage - usageMessage = usageMessage + " -m|--mono" - - global validShortArgs - validShortArgs = "m" - - global validLongArgs - validLongArgs.append("mono") - - commonInit() - -def phpInit(): - commonInit() - class InvalidSelectorString(Exception): def __init__(self, value): self.value = value @@ -772,9 +748,6 @@ def getCommandLine(exe, config, env = getTestEnv()): return commandline def runTests(args, tests, num = 0): - global testErrors - global keepGoing - # # Run each of the tests. # @@ -791,20 +764,21 @@ def runTests(args, tests, num = 0): os.chdir(dir) - if isWin9x(): - status = os.system("python " + os.path.join(dir, "run.py " + args)) - else: - status = os.system(os.path.join(dir, "run.py " + args)) + status = os.system("python " + os.path.join(dir, "run.py " + args)) + #print "python " + os.path.join(dir, "run.py " + args) + #status = 0 if status: if(num > 0): print "[" + str(num) + "]", message = "test in " + os.path.abspath(dir) + " failed with exit status", status, print message + global keepGoing if keepGoing == 0: sys.exit(status) else: print " ** Error logged and will be displayed again when suite is completed **" + global testErrors testErrors.append(message) def getDefaultServerFile(): @@ -1020,7 +994,7 @@ def startClient(exe, args, config=None, env=getTestEnv()): if config == None: config = DriverConfig("client") if debug: - print getCommandLine(exe, config, env) + args + print "(" + getCommandLine(exe, config, env) + args + ")", if config.lang == "php": os.chdir(os.path.dirname(os.path.abspath(exe))) @@ -1039,14 +1013,14 @@ def startServer(exe, args, config=None, env=getTestEnv()): if config == None: config = DriverConfig("server") if debug: - print getCommandLine(exe, config, env) + args + print "(" + getCommandLine(exe, config, env) + args + ")", return os.popen(getCommandLine(exe, config, env) + args) def startColloc(exe, args, config=None, env=getTestEnv()): if config == None: config = DriverConfig("colloc") if debug: - print getCommandLine(exe, config, env) + args + print "(" + getCommandLine(exe, config, env) + args + ")", return os.popen(getCommandLine(exe, config, env) + args) def getMappingDir(currentDir): @@ -1058,72 +1032,55 @@ def getBinDir(currentDir): def getCertsDir(currentDir): return os.path.abspath(os.path.join(findTopLevel(), "certs")) -validShortArgs = "lr:R:" -validLongArgs = ["start=", "start-after=", "filter=", "rfilter=", "all", "loop", "debug", "protocol=", - "compress", "host=", "threadPerConnection", "continue", "ipv6"] +def processCmdLine(): + def usage(): + print "usage: " + sys.argv[0] + """ + --debug Display debugging information on each test. + --protocol=tcp|ssl Run with the given protocol. + --compress Run the tests with protocol compression. + --host=host Set --Ice.Default.Host=<host>. + --threadPerConnection Run with thread-per-connection concurrency model. + --ipv6 Use IPv6 addresses. + --mono Use mono when running C# tests. + """ + sys.exit(2) -opts = [] -args = [] -loop = False -arg = "" -all = False + try: + opts, args = getopt.getopt( + sys.argv[1:], "", ["debug", "protocol=", "compress", "host=", "threadPerConnection", "ipv6", "mono"]) + except getopt.GetoptError: + usage() + + if args: + usage() + + for o, a in opts: + if o in ["--mono"]: + global mono + mono = 1 + elif o == "--compress": + global compress + compress = 1 + elif o == "--threadPerConnection": + global threadPerConnection + threadPerConnection = 1 + elif o == "--host": + global host + host = a + elif o == "--ipv6": + global ipv6 + ipv6 = 1 + elif o == "--debug": + global debug + debug = 1 + elif o == "--protocol": + if a not in ( "ssl", "tcp"): + usage() + global protocol + protocol = a + + if len(args) > 0: + usage() if os.environ.has_key("ICE_CONFIG"): os.unsetenv("ICE_CONFIG") - -try: - opts, args = getopt.getopt(sys.argv[1:], validShortArgs, validLongArgs) -except getopt.GetoptError: - usage() - -if args: - usage() - -testFilter = None -removeFilter = False -start = 0 - -for o, a in opts: - if o in ["-m", "--mono"]: - mono = 1 - elif o == "--continue": - keepGoing = 1 - elif o == "--compress": - compress = 1 - elif o == "--threadPerConnection": - threadPerConnection = 1 - elif o == "--host": - host = a - elif o == "--ipv6": - ipv6 = 1 - elif o in ("-l", "--loop"): - loop = True - elif o in ("-r", "-R", "--filter", '--rfilter'): - testFilter = re.compile(a) - if o in ("--rfilter", "-R"): - removeFilter = True - elif o == "--all" : - all = True - 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:] - elif o == "--debug": - debug = 1 - elif o == "--protocol": - if a not in ( "ssl", "tcp"): - usage() - protocol = a - - if o in ( "--protocol", "--host", "--debug", "--compress", "--threadPerConnection", "--ipv6"): - arg += " " + o - if len(a) > 0: - arg += " " + a - -if all and len(arg) > 0: - usage() - diff --git a/cpp/allTests.py b/cpp/allTests.py index fb8a2723ce7..c8afb08143d 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -20,7 +20,6 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil - # # List of all basic tests. # diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py index 8fa474a2a7a..19395e6cc75 100755 --- a/cpp/test/Freeze/complex/run.py +++ b/cpp/test/Freeze/complex/run.py @@ -18,7 +18,8 @@ else: raise "can't find toplevel directory!" sys.path.append(os.path.join(toplevel, "config")) -import TestUtil +import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py index 87f2961e254..294171da26c 100755 --- a/cpp/test/Freeze/dbmap/run.py +++ b/cpp/test/Freeze/dbmap/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py index f47ebccee03..9f1f6bf50f4 100755 --- a/cpp/test/Freeze/evictor/run.py +++ b/cpp/test/Freeze/evictor/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Freeze", "evictor") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/Freeze/oldevictor/run.py b/cpp/test/Freeze/oldevictor/run.py index 1b26f8ccc1e..64ef39f758a 100755 --- a/cpp/test/Freeze/oldevictor/run.py +++ b/cpp/test/Freeze/oldevictor/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Freeze", "oldevictor") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py index daa7da82709..bba63dcc45e 100755 --- a/cpp/test/FreezeScript/dbmap/run.py +++ b/cpp/test/FreezeScript/dbmap/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() directory = os.path.dirname(os.path.abspath(__file__)) transformdb = os.path.join(toplevel, "cpp", "bin", "transformdb") diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py index 5d4fe72d273..eac5e2a36e9 100755 --- a/cpp/test/FreezeScript/evictor/run.py +++ b/cpp/test/FreezeScript/evictor/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() directory = os.path.dirname(os.path.abspath(__file__)) transformdb = os.path.join(toplevel, "cpp", "bin", "transformdb") diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py index 93aedcc71bc..2f8f5650054 100755 --- a/cpp/test/Glacier2/attack/run.py +++ b/cpp/test/Glacier2/attack/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() router = os.path.join(TestUtil.getBinDir(__file__), "glacier2router") diff --git a/cpp/test/Glacier2/dynamicFiltering/run.py b/cpp/test/Glacier2/dynamicFiltering/run.py index 3121484d7f5..0ab8401a702 100755 --- a/cpp/test/Glacier2/dynamicFiltering/run.py +++ b/cpp/test/Glacier2/dynamicFiltering/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py index 3069d0b6cbf..bcddfc5a9c8 100755 --- a/cpp/test/Glacier2/router/run.py +++ b/cpp/test/Glacier2/router/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() router = os.path.join(TestUtil.getBinDir(__file__), "glacier2router") diff --git a/cpp/test/Glacier2/sessionControl/run.py b/cpp/test/Glacier2/sessionControl/run.py index c8aaf3670bd..048eba6a562 100755 --- a/cpp/test/Glacier2/sessionControl/run.py +++ b/cpp/test/Glacier2/sessionControl/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Glacier2", "sessionControl") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py index 2333b7445b0..f0febbd9ec3 100755 --- a/cpp/test/Glacier2/ssl/run.py +++ b/cpp/test/Glacier2/ssl/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Glacier2", "ssl") diff --git a/cpp/test/Glacier2/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py index c91c2906c45..36f4772a1bf 100755 --- a/cpp/test/Glacier2/staticFiltering/run.py +++ b/cpp/test/Glacier2/staticFiltering/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() hostname = socket.gethostname() fqdn = socket.getfqdn() diff --git a/cpp/test/Ice/adapterDeactivation/run.py b/cpp/test/Ice/adapterDeactivation/run.py index 6a844bd1e05..789ff1b7f41 100755 --- a/cpp/test/Ice/adapterDeactivation/run.py +++ b/cpp/test/Ice/adapterDeactivation/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "adapterDeactivation") diff --git a/cpp/test/Ice/background/run.py b/cpp/test/Ice/background/run.py index 1f1d365cadc..ffa6acdbc2b 100755 --- a/cpp/test/Ice/background/run.py +++ b/cpp/test/Ice/background/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "background") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/Ice/binding/run.py b/cpp/test/Ice/binding/run.py index 4740b351018..02f04424efa 100755 --- a/cpp/test/Ice/binding/run.py +++ b/cpp/test/Ice/binding/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "binding") diff --git a/cpp/test/Ice/checksum/run.py b/cpp/test/Ice/checksum/run.py index 1cca9d69d43..97845fd0f6d 100755 --- a/cpp/test/Ice/checksum/run.py +++ b/cpp/test/Ice/checksum/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "checksum") diff --git a/cpp/test/Ice/custom/run.py b/cpp/test/Ice/custom/run.py index ecc72eecef7..e3615b0dd26 100755 --- a/cpp/test/Ice/custom/run.py +++ b/cpp/test/Ice/custom/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "custom") diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py index ce9ce8c6580..1fe8ff8f01d 100755 --- a/cpp/test/Ice/exceptions/run.py +++ b/cpp/test/Ice/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "exceptions") diff --git a/cpp/test/Ice/facets/run.py b/cpp/test/Ice/facets/run.py index 6819bee9a27..b3afa6aeb5f 100755 --- a/cpp/test/Ice/facets/run.py +++ b/cpp/test/Ice/facets/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "facets") diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py index 4609ee06f1b..0e091b083ec 100755 --- a/cpp/test/Ice/faultTolerance/run.py +++ b/cpp/test/Ice/faultTolerance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "faultTolerance") diff --git a/cpp/test/Ice/gc/run.py b/cpp/test/Ice/gc/run.py index e67d0c7ae99..011684a5e3b 100755 --- a/cpp/test/Ice/gc/run.py +++ b/cpp/test/Ice/gc/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "gc") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/Ice/hold/run.py b/cpp/test/Ice/hold/run.py index 6fe4eba0621..e67fb9482ac 100755 --- a/cpp/test/Ice/hold/run.py +++ b/cpp/test/Ice/hold/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "hold") diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py index 4891102c8f9..7ecff0e5ae5 100755 --- a/cpp/test/Ice/inheritance/run.py +++ b/cpp/test/Ice/inheritance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "inheritance") diff --git a/cpp/test/Ice/interceptor/run.py b/cpp/test/Ice/interceptor/run.py index 6014850b376..579120a0d0c 100755 --- a/cpp/test/Ice/interceptor/run.py +++ b/cpp/test/Ice/interceptor/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py index be23e30ec16..177ebe2fb41 100755 --- a/cpp/test/Ice/location/run.py +++ b/cpp/test/Ice/location/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "location") diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py index 6540f10fb9f..81b178ba4f4 100755 --- a/cpp/test/Ice/objects/run.py +++ b/cpp/test/Ice/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "objects") diff --git a/cpp/test/Ice/operations/run.py b/cpp/test/Ice/operations/run.py index 79e05add351..04d358c2981 100755 --- a/cpp/test/Ice/operations/run.py +++ b/cpp/test/Ice/operations/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "operations") diff --git a/cpp/test/Ice/proxy/run.py b/cpp/test/Ice/proxy/run.py index 2fb4c95a37d..f991276d917 100755 --- a/cpp/test/Ice/proxy/run.py +++ b/cpp/test/Ice/proxy/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "proxy") diff --git a/cpp/test/Ice/retry/run.py b/cpp/test/Ice/retry/run.py index 1872e2f2a0e..f0bc8d57120 100755 --- a/cpp/test/Ice/retry/run.py +++ b/cpp/test/Ice/retry/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "retry") diff --git a/cpp/test/Ice/servantLocator/run.py b/cpp/test/Ice/servantLocator/run.py index 0998bc7e6fd..527b3b391e9 100755 --- a/cpp/test/Ice/servantLocator/run.py +++ b/cpp/test/Ice/servantLocator/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "servantLocator") diff --git a/cpp/test/Ice/slicing/exceptions/run.py b/cpp/test/Ice/slicing/exceptions/run.py index 2bf539d286b..e5effa1c47e 100755 --- a/cpp/test/Ice/slicing/exceptions/run.py +++ b/cpp/test/Ice/slicing/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "exceptions") diff --git a/cpp/test/Ice/slicing/objects/run.py b/cpp/test/Ice/slicing/objects/run.py index 376ba0dacaf..11ef0384e8f 100755 --- a/cpp/test/Ice/slicing/objects/run.py +++ b/cpp/test/Ice/slicing/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "objects") diff --git a/cpp/test/Ice/stream/run.py b/cpp/test/Ice/stream/run.py index 94144947408..a8d95e0d012 100755 --- a/cpp/test/Ice/stream/run.py +++ b/cpp/test/Ice/stream/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() client = os.path.join(os.path.dirname(os.path.abspath(__file__)), "client") diff --git a/cpp/test/Ice/stringConverter/run.py b/cpp/test/Ice/stringConverter/run.py index 1bb518aa9fc..1e05abd1220 100755 --- a/cpp/test/Ice/stringConverter/run.py +++ b/cpp/test/Ice/stringConverter/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/Ice/threads/run.py b/cpp/test/Ice/threads/run.py index b86ec511481..bbd15920d76 100755 --- a/cpp/test/Ice/threads/run.py +++ b/cpp/test/Ice/threads/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "threads") diff --git a/cpp/test/Ice/timeout/run.py b/cpp/test/Ice/timeout/run.py index dde06549964..f04e73b903a 100755 --- a/cpp/test/Ice/timeout/run.py +++ b/cpp/test/Ice/timeout/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "timeout") diff --git a/cpp/test/IceBox/configuration/run.py b/cpp/test/IceBox/configuration/run.py index 5cccb599ce0..2b8faa2881a 100755 --- a/cpp/test/IceBox/configuration/run.py +++ b/cpp/test/IceBox/configuration/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceBox", "configuration") diff --git a/cpp/test/IceGrid/activation/run.py b/cpp/test/IceGrid/activation/run.py index 49518d05260..5f665f74b93 100755 --- a/cpp/test/IceGrid/activation/run.py +++ b/cpp/test/IceGrid/activation/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceGrid", "activation") diff --git a/cpp/test/IceGrid/allocation/run.py b/cpp/test/IceGrid/allocation/run.py index c236cc70599..36e87f4808f 100755 --- a/cpp/test/IceGrid/allocation/run.py +++ b/cpp/test/IceGrid/allocation/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceGrid", "allocation") diff --git a/cpp/test/IceGrid/deployer/run.py b/cpp/test/IceGrid/deployer/run.py index c153fc069fd..62d8f8d6523 100755 --- a/cpp/test/IceGrid/deployer/run.py +++ b/cpp/test/IceGrid/deployer/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceGrid", "deployer") diff --git a/cpp/test/IceGrid/distribution/run.py b/cpp/test/IceGrid/distribution/run.py index 43863bb90ed..0fd825d771a 100755 --- a/cpp/test/IceGrid/distribution/run.py +++ b/cpp/test/IceGrid/distribution/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin def icepatch2Calc(datadir, dirname): diff --git a/cpp/test/IceGrid/replicaGroup/run.py b/cpp/test/IceGrid/replicaGroup/run.py index 8de2443fb14..d5fa8c36514 100755 --- a/cpp/test/IceGrid/replicaGroup/run.py +++ b/cpp/test/IceGrid/replicaGroup/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceGrid", "replicaGroup") diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py index 3c93ef42806..33ccce57501 100755 --- a/cpp/test/IceGrid/replication/run.py +++ b/cpp/test/IceGrid/replication/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceGrid", "replication") diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py index d9b34547674..2641badd573 100755 --- a/cpp/test/IceGrid/session/run.py +++ b/cpp/test/IceGrid/session/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin if not TestUtil.isWin32() and os.getuid() == 0: diff --git a/cpp/test/IceGrid/simple/run.py b/cpp/test/IceGrid/simple/run.py index d90c5932723..b42a2ce003a 100755 --- a/cpp/test/IceGrid/simple/run.py +++ b/cpp/test/IceGrid/simple/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceGrid", "simple") diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py index c8cec14318d..07133c53ad6 100755 --- a/cpp/test/IceGrid/update/run.py +++ b/cpp/test/IceGrid/update/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceGrid", "update") diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py index bc1c833c146..9831ce15e62 100755 --- a/cpp/test/IceSSL/configuration/run.py +++ b/cpp/test/IceSSL/configuration/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceSSL", "configuration") diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py index 598f4abbb67..3f36ce46a4c 100755 --- a/cpp/test/IceStorm/federation/run.py +++ b/cpp/test/IceStorm/federation/run.py @@ -20,6 +20,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceStorm", "federation") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index 4c4a187ee50..411533e1ff0 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceStorm", "federation2") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index ce1f7758ea8..01f378c25cf 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -20,6 +20,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceStorm", "single") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py index 89235907598..dacf98b7a2b 100755 --- a/cpp/test/IceStorm/stress/run.py +++ b/cpp/test/IceStorm/stress/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceStorm", "stress") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/IceUtil/condvar/run.py b/cpp/test/IceUtil/condvar/run.py index 3060d194831..ad44a80d148 100755 --- a/cpp/test/IceUtil/condvar/run.py +++ b/cpp/test/IceUtil/condvar/run.py @@ -19,12 +19,15 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) workqueue = os.path.join(testdir, "workqueue") print "starting workqueue...", +if TestUtil.debug: + print "(" + workqueue + ")", workqueuePipe = os.popen(workqueue + " 2>&1") print "ok" diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py index 1f0816bd4af..2fb0e96c3e5 100755 --- a/cpp/test/IceUtil/inputUtil/run.py +++ b/cpp/test/IceUtil/inputUtil/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py index 394aa162dfc..6d4273abdea 100755 --- a/cpp/test/IceUtil/thread/run.py +++ b/cpp/test/IceUtil/thread/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) @@ -26,7 +27,10 @@ client = os.path.join(testdir, "client") clientOptions = ' ' + testdir print "starting client...", -clientPipe = os.popen(client + clientOptions + " 2>&1") +command = client + clientOptions +if TestUtil.debug: + print "(" + command + ")", +clientPipe = os.popen(command + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/IceUtil/timer/run.py b/cpp/test/IceUtil/timer/run.py index 1bb518aa9fc..1e05abd1220 100755 --- a/cpp/test/IceUtil/timer/run.py +++ b/cpp/test/IceUtil/timer/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py index e5f00245ce9..e004f5eb142 100755 --- a/cpp/test/IceUtil/unicode/run.py +++ b/cpp/test/IceUtil/unicode/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cpp/test/IceUtil/uuid/run.py b/cpp/test/IceUtil/uuid/run.py index 1bb518aa9fc..0c8912bde72 100755 --- a/cpp/test/IceUtil/uuid/run.py +++ b/cpp/test/IceUtil/uuid/run.py @@ -19,12 +19,15 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) client = os.path.join(testdir, "client") print "starting client...", +if TestUtil.debug: + print "(" + client + ")", clientPipe = os.popen(client + " 2>&1") print "ok" diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py index 6fedf753866..81554dfc998 100755 --- a/cpp/test/Slice/errorDetection/run.py +++ b/cpp/test/Slice/errorDetection/run.py @@ -22,6 +22,7 @@ else: # sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() directory = os.path.dirname(os.path.abspath(__file__)) slice2cpp = os.path.join(TestUtil.getBinDir(__file__), "slice2cpp") diff --git a/cpp/test/Slice/keyword/run.py b/cpp/test/Slice/keyword/run.py index cad915b57ec..4863f077175 100755 --- a/cpp/test/Slice/keyword/run.py +++ b/cpp/test/Slice/keyword/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Slice", "keyword") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cppe/test/IceE/adapterDeactivation/run.py b/cppe/test/IceE/adapterDeactivation/run.py index 2f0572679fa..7408cefcab8 100755 --- a/cppe/test/IceE/adapterDeactivation/run.py +++ b/cppe/test/IceE/adapterDeactivation/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "adapterDeactivation") diff --git a/cppe/test/IceE/custom/run.py b/cppe/test/IceE/custom/run.py index b13d30bf8ee..c3403057788 100755 --- a/cppe/test/IceE/custom/run.py +++ b/cppe/test/IceE/custom/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "custom") diff --git a/cppe/test/IceE/exceptions/run.py b/cppe/test/IceE/exceptions/run.py index 89a2c7bf383..d38965da5e6 100755 --- a/cppe/test/IceE/exceptions/run.py +++ b/cppe/test/IceE/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "exceptions") diff --git a/cppe/test/IceE/facets/run.py b/cppe/test/IceE/facets/run.py index 3656d174805..ddcbc42e7c5 100755 --- a/cppe/test/IceE/facets/run.py +++ b/cppe/test/IceE/facets/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "facets") diff --git a/cppe/test/IceE/faultTolerance/run.py b/cppe/test/IceE/faultTolerance/run.py index 9648abbaffa..ee4eb872a7f 100755 --- a/cppe/test/IceE/faultTolerance/run.py +++ b/cppe/test/IceE/faultTolerance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "faultTolerance") testdir = os.path.join(toplevel, "test", name) diff --git a/cppe/test/IceE/inheritance/run.py b/cppe/test/IceE/inheritance/run.py index f51bfce8b0f..63ae546db37 100755 --- a/cppe/test/IceE/inheritance/run.py +++ b/cppe/test/IceE/inheritance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "inheritance") diff --git a/cppe/test/IceE/location/run.py b/cppe/test/IceE/location/run.py index d035eec195d..0ecb73d8819 100755 --- a/cppe/test/IceE/location/run.py +++ b/cppe/test/IceE/location/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "location") diff --git a/cppe/test/IceE/operations/run.py b/cppe/test/IceE/operations/run.py index 48dbd71e0fc..4cb3eafd0b1 100755 --- a/cppe/test/IceE/operations/run.py +++ b/cppe/test/IceE/operations/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "operations") diff --git a/cppe/test/IceE/proxy/run.py b/cppe/test/IceE/proxy/run.py index 70c868e9f69..3ca8d4159d6 100755 --- a/cppe/test/IceE/proxy/run.py +++ b/cppe/test/IceE/proxy/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "proxy") diff --git a/cppe/test/IceE/retry/run.py b/cppe/test/IceE/retry/run.py index fc4aa8df3ae..8c42efe3c29 100755 --- a/cppe/test/IceE/retry/run.py +++ b/cppe/test/IceE/retry/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "retry") diff --git a/cppe/test/IceE/slicing/run.py b/cppe/test/IceE/slicing/run.py index 7f6dd3054f8..1f757e46f77 100755 --- a/cppe/test/IceE/slicing/run.py +++ b/cppe/test/IceE/slicing/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "slicing") diff --git a/cppe/test/IceE/thread/run.py b/cppe/test/IceE/thread/run.py index 4739503a4b0..22d927c0bfd 100755 --- a/cppe/test/IceE/thread/run.py +++ b/cppe/test/IceE/thread/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "thread") testdir = os.path.join(toplevel, "test", name) diff --git a/cppe/test/IceE/uuid/run.py b/cppe/test/IceE/uuid/run.py index 4b6f120a28c..fe66ca2694c 100755 --- a/cppe/test/IceE/uuid/run.py +++ b/cppe/test/IceE/uuid/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "uuid") testdir = os.path.join(toplevel, "test", name) diff --git a/cs/test/Glacier2/attack/run.py b/cs/test/Glacier2/attack/run.py index 9f67e2506be..c75548871db 100755 --- a/cs/test/Glacier2/attack/run.py +++ b/cs/test/Glacier2/attack/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() router = os.path.join(TestUtil.getIceCppDir(), "bin", "glacier2router") name = os.path.join("Glacier2", "router") diff --git a/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py index 0a11861d82d..132ef27241e 100755 --- a/cs/test/Glacier2/router/run.py +++ b/cs/test/Glacier2/router/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() router = os.path.join(TestUtil.getIceCppDir(), "bin", "glacier2router") name = os.path.join("Glacier2", "router") diff --git a/cs/test/Ice/adapterDeactivation/run.py b/cs/test/Ice/adapterDeactivation/run.py index 161b5bcb740..d6b3157dd2e 100755 --- a/cs/test/Ice/adapterDeactivation/run.py +++ b/cs/test/Ice/adapterDeactivation/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "adapterDeactivation") diff --git a/cs/test/Ice/background/run.py b/cs/test/Ice/background/run.py index ecf5ec59372..9e6678eb11c 100755 --- a/cs/test/Ice/background/run.py +++ b/cs/test/Ice/background/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "background") diff --git a/cs/test/Ice/binding/run.py b/cs/test/Ice/binding/run.py index 39278d0e1ed..b1435679753 100755 --- a/cs/test/Ice/binding/run.py +++ b/cs/test/Ice/binding/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "binding") diff --git a/cs/test/Ice/checksum/run.py b/cs/test/Ice/checksum/run.py index 0fd6b588f1d..ede7e1a4419 100755 --- a/cs/test/Ice/checksum/run.py +++ b/cs/test/Ice/checksum/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "checksum") diff --git a/cs/test/Ice/dictMapping/run.py b/cs/test/Ice/dictMapping/run.py index 6a215a4ba47..281e64cc767 100755 --- a/cs/test/Ice/dictMapping/run.py +++ b/cs/test/Ice/dictMapping/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "dictMapping") diff --git a/cs/test/Ice/exceptions/run.py b/cs/test/Ice/exceptions/run.py index bfc62591c50..ba86355a237 100755 --- a/cs/test/Ice/exceptions/run.py +++ b/cs/test/Ice/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "exceptions") diff --git a/cs/test/Ice/facets/run.py b/cs/test/Ice/facets/run.py index 5dff31b87c3..3c4d1ec1b78 100755 --- a/cs/test/Ice/facets/run.py +++ b/cs/test/Ice/facets/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "facets") diff --git a/cs/test/Ice/faultTolerance/run.py b/cs/test/Ice/faultTolerance/run.py index 8cd98286630..a9aa8a52d88 100755 --- a/cs/test/Ice/faultTolerance/run.py +++ b/cs/test/Ice/faultTolerance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "faultTolerance") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cs/test/Ice/hold/run.py b/cs/test/Ice/hold/run.py index 51aa0a2a05a..b70138f8bf5 100755 --- a/cs/test/Ice/hold/run.py +++ b/cs/test/Ice/hold/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "hold") diff --git a/cs/test/Ice/inheritance/run.py b/cs/test/Ice/inheritance/run.py index bc349bf571d..f535ac5d996 100755 --- a/cs/test/Ice/inheritance/run.py +++ b/cs/test/Ice/inheritance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "inheritance") diff --git a/cs/test/Ice/interceptor/run.py b/cs/test/Ice/interceptor/run.py index b64c29741f2..39b209eae04 100755 --- a/cs/test/Ice/interceptor/run.py +++ b/cs/test/Ice/interceptor/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "interceptor") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cs/test/Ice/location/run.py b/cs/test/Ice/location/run.py index 4c2f7841b3b..cccad85b373 100755 --- a/cs/test/Ice/location/run.py +++ b/cs/test/Ice/location/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "location") diff --git a/cs/test/Ice/objects/run.py b/cs/test/Ice/objects/run.py index 2f9e0159878..adced32c9ce 100755 --- a/cs/test/Ice/objects/run.py +++ b/cs/test/Ice/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "objects") diff --git a/cs/test/Ice/operations/run.py b/cs/test/Ice/operations/run.py index 1c06b959dd3..397721ba8b5 100755 --- a/cs/test/Ice/operations/run.py +++ b/cs/test/Ice/operations/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "operations") diff --git a/cs/test/Ice/proxy/run.py b/cs/test/Ice/proxy/run.py index 6dd9eb42c80..9fd10bc4cd0 100755 --- a/cs/test/Ice/proxy/run.py +++ b/cs/test/Ice/proxy/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "proxy") diff --git a/cs/test/Ice/retry/run.py b/cs/test/Ice/retry/run.py index 80654b32d35..e6355dc1f5b 100755 --- a/cs/test/Ice/retry/run.py +++ b/cs/test/Ice/retry/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "retry") diff --git a/cs/test/Ice/seqMapping/run.py b/cs/test/Ice/seqMapping/run.py index 37b4ac64f7e..33346c7072b 100755 --- a/cs/test/Ice/seqMapping/run.py +++ b/cs/test/Ice/seqMapping/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "seqMapping") diff --git a/cs/test/Ice/servantLocator/run.py b/cs/test/Ice/servantLocator/run.py index ac8aa2e1c80..819e942f21a 100755 --- a/cs/test/Ice/servantLocator/run.py +++ b/cs/test/Ice/servantLocator/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "servantLocator") diff --git a/cs/test/Ice/slicing/exceptions/run.py b/cs/test/Ice/slicing/exceptions/run.py index d0a8b55c14a..62a35c4ad8e 100755 --- a/cs/test/Ice/slicing/exceptions/run.py +++ b/cs/test/Ice/slicing/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "exceptions") diff --git a/cs/test/Ice/slicing/objects/run.py b/cs/test/Ice/slicing/objects/run.py index e388e152f43..132196d0d54 100755 --- a/cs/test/Ice/slicing/objects/run.py +++ b/cs/test/Ice/slicing/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "objects") diff --git a/cs/test/Ice/stream/run.py b/cs/test/Ice/stream/run.py index 836459382c4..314b43e19c6 100755 --- a/cs/test/Ice/stream/run.py +++ b/cs/test/Ice/stream/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "stream") diff --git a/cs/test/Ice/threads/run.py b/cs/test/Ice/threads/run.py index c1feda0c057..4a8c3e16082 100755 --- a/cs/test/Ice/threads/run.py +++ b/cs/test/Ice/threads/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "threads") diff --git a/cs/test/Ice/timeout/run.py b/cs/test/Ice/timeout/run.py index f05b2813be8..21b55b1ce7f 100755 --- a/cs/test/Ice/timeout/run.py +++ b/cs/test/Ice/timeout/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "timeout") diff --git a/cs/test/IceBox/configuration/run.py b/cs/test/IceBox/configuration/run.py index 7dd74b5c501..2314437bacb 100755 --- a/cs/test/IceBox/configuration/run.py +++ b/cs/test/IceBox/configuration/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceBox", "configuration") diff --git a/cs/test/IceGrid/simple/run.py b/cs/test/IceGrid/simple/run.py index 91dfa96cc3b..aae28fc00e8 100755 --- a/cs/test/IceGrid/simple/run.py +++ b/cs/test/IceGrid/simple/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceGrid", "simple") diff --git a/cs/test/IceSSL/configuration/run.py b/cs/test/IceSSL/configuration/run.py index c3c7cbf890f..a21f6a11f0e 100755 --- a/cs/test/IceSSL/configuration/run.py +++ b/cs/test/IceSSL/configuration/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceSSL", "configuration") diff --git a/cs/test/IceUtil/inputUtil/run.py b/cs/test/IceUtil/inputUtil/run.py index a6fd44062cb..be190ef14ad 100755 --- a/cs/test/IceUtil/inputUtil/run.py +++ b/cs/test/IceUtil/inputUtil/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceUtil", "inputUtil") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/cs/test/Slice/keyword/run.py b/cs/test/Slice/keyword/run.py index 2b070348d7f..93c2ae5a686 100755 --- a/cs/test/Slice/keyword/run.py +++ b/cs/test/Slice/keyword/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Slice", "keyword") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Freeze/complex/run.py b/java/test/Freeze/complex/run.py index 1acaebabeaf..bcb9ba442dd 100755 --- a/java/test/Freeze/complex/run.py +++ b/java/test/Freeze/complex/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Freeze", "complex") testdir = os.path.join(toplevel, "test", name) diff --git a/java/test/Freeze/dbmap/run.py b/java/test/Freeze/dbmap/run.py index 5a34b661b16..a304c10eac4 100755 --- a/java/test/Freeze/dbmap/run.py +++ b/java/test/Freeze/dbmap/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Freeze", "dbmap") testdir = os.path.join(toplevel, "test", name) diff --git a/java/test/Freeze/evictor/run.py b/java/test/Freeze/evictor/run.py index 980cdd01608..ad872902b86 100755 --- a/java/test/Freeze/evictor/run.py +++ b/java/test/Freeze/evictor/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Freeze", "evictor") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Freeze/oldevictor/run.py b/java/test/Freeze/oldevictor/run.py index cadcf329497..daa73970fd6 100755 --- a/java/test/Freeze/oldevictor/run.py +++ b/java/test/Freeze/oldevictor/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Freeze", "oldevictor") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Glacier2/attack/run.py b/java/test/Glacier2/attack/run.py index 1baae63b6f4..570571973f4 100755 --- a/java/test/Glacier2/attack/run.py +++ b/java/test/Glacier2/attack/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py index 38ab73b270c..e6e033dcdac 100755 --- a/java/test/Glacier2/router/run.py +++ b/java/test/Glacier2/router/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/adapterDeactivation/run.py b/java/test/Ice/adapterDeactivation/run.py index 0291a1b4c45..2846cef184e 100755 --- a/java/test/Ice/adapterDeactivation/run.py +++ b/java/test/Ice/adapterDeactivation/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "adapterDeactivation") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/background/run.py b/java/test/Ice/background/run.py index 7b664f77c78..bc7d8cec1a6 100755 --- a/java/test/Ice/background/run.py +++ b/java/test/Ice/background/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "background") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/binding/run.py b/java/test/Ice/binding/run.py index 12a88ed2525..a6692f5fb4f 100755 --- a/java/test/Ice/binding/run.py +++ b/java/test/Ice/binding/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "binding") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/checksum/run.py b/java/test/Ice/checksum/run.py index 22693a8c689..b3506b44cfa 100755 --- a/java/test/Ice/checksum/run.py +++ b/java/test/Ice/checksum/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "checksum") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/custom/run.py b/java/test/Ice/custom/run.py index 1c022e04e7a..6f12a4ff810 100755 --- a/java/test/Ice/custom/run.py +++ b/java/test/Ice/custom/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "custom") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py index 0ab4bd2578b..e346442d91f 100755 --- a/java/test/Ice/exceptions/run.py +++ b/java/test/Ice/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "exceptions") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/facets/run.py b/java/test/Ice/facets/run.py index cc0eab857ec..2e620209daf 100755 --- a/java/test/Ice/facets/run.py +++ b/java/test/Ice/facets/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "facets") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py index 3e655127b6b..dc00f62f71e 100755 --- a/java/test/Ice/faultTolerance/run.py +++ b/java/test/Ice/faultTolerance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "faultTolerance") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/hold/run.py b/java/test/Ice/hold/run.py index cfc18b2de8e..3aad16bf8fe 100755 --- a/java/test/Ice/hold/run.py +++ b/java/test/Ice/hold/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "hold") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py index ef8381060b3..9ec103a4045 100755 --- a/java/test/Ice/inheritance/run.py +++ b/java/test/Ice/inheritance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "inheritance") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/interceptor/run.py b/java/test/Ice/interceptor/run.py index 22ab302f1a6..be50948eebd 100755 --- a/java/test/Ice/interceptor/run.py +++ b/java/test/Ice/interceptor/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "interceptor") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/location/run.py b/java/test/Ice/location/run.py index 6301f79ea63..b2271b88770 100755 --- a/java/test/Ice/location/run.py +++ b/java/test/Ice/location/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "location") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/objects/run.py b/java/test/Ice/objects/run.py index 5c27fcdbd78..ec17ac79ecf 100755 --- a/java/test/Ice/objects/run.py +++ b/java/test/Ice/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "objects") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/operations/run.py b/java/test/Ice/operations/run.py index 73f677ed565..84cccf81362 100755 --- a/java/test/Ice/operations/run.py +++ b/java/test/Ice/operations/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "operations") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/package/run.py b/java/test/Ice/package/run.py index 860d49e7d69..f72ab158050 100755 --- a/java/test/Ice/package/run.py +++ b/java/test/Ice/package/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "package") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/proxy/run.py b/java/test/Ice/proxy/run.py index bf88928add9..26c6aba7ca0 100755 --- a/java/test/Ice/proxy/run.py +++ b/java/test/Ice/proxy/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "proxy") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/retry/run.py b/java/test/Ice/retry/run.py index b98c962fdbc..245f4dd2f87 100755 --- a/java/test/Ice/retry/run.py +++ b/java/test/Ice/retry/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "retry") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/servantLocator/run.py b/java/test/Ice/servantLocator/run.py index 1b626736cb9..a337928b7e3 100755 --- a/java/test/Ice/servantLocator/run.py +++ b/java/test/Ice/servantLocator/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "servantLocator") nameAMD = os.path.join("Ice", "servantLocatorAMD") diff --git a/java/test/Ice/slicing/exceptions/run.py b/java/test/Ice/slicing/exceptions/run.py index d4fce29bad0..237610d7a45 100755 --- a/java/test/Ice/slicing/exceptions/run.py +++ b/java/test/Ice/slicing/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "exceptions") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/slicing/objects/run.py b/java/test/Ice/slicing/objects/run.py index 99ced240f7c..5b834e189ff 100755 --- a/java/test/Ice/slicing/objects/run.py +++ b/java/test/Ice/slicing/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "objects") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/stream/run.py b/java/test/Ice/stream/run.py index ce9b9f29b13..09be18dd69f 100755 --- a/java/test/Ice/stream/run.py +++ b/java/test/Ice/stream/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "stream") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Ice/threads/run.py b/java/test/Ice/threads/run.py index b685d48e201..aec5c5e965b 100755 --- a/java/test/Ice/threads/run.py +++ b/java/test/Ice/threads/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() if TestUtil.getIceSSLVersion() == "1.4": print "Detected IceSSL version that requires thread-per-connection, skipping test." diff --git a/java/test/Ice/timeout/run.py b/java/test/Ice/timeout/run.py index 8e8e1d643af..57729b5145a 100755 --- a/java/test/Ice/timeout/run.py +++ b/java/test/Ice/timeout/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "timeout") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/IceBox/configuration/run.py b/java/test/IceBox/configuration/run.py index a0768808eb3..5b921e2ba2b 100755 --- a/java/test/IceBox/configuration/run.py +++ b/java/test/IceBox/configuration/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin name = os.path.join("IceBox", "configuration") diff --git a/java/test/IceGrid/simple/run.py b/java/test/IceGrid/simple/run.py index bf331c38d63..38b267460bc 100755 --- a/java/test/IceGrid/simple/run.py +++ b/java/test/IceGrid/simple/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() import IceGridAdmin testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/IceSSL/configuration/run.py b/java/test/IceSSL/configuration/run.py index 2bda29dd484..0c45d6d34d8 100755 --- a/java/test/IceSSL/configuration/run.py +++ b/java/test/IceSSL/configuration/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceSSL", "configuration") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/IceUtil/inputUtil/run.py b/java/test/IceUtil/inputUtil/run.py index 95450e92958..6e33ce61269 100755 --- a/java/test/IceUtil/inputUtil/run.py +++ b/java/test/IceUtil/inputUtil/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceUtil", "inputUtil") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/java/test/Slice/keyword/run.py b/java/test/Slice/keyword/run.py index 19dc8fa1e00..95c29eed3c1 100755 --- a/java/test/Slice/keyword/run.py +++ b/java/test/Slice/keyword/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Slice", "keyword") testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/javae/test/IceE/adapterDeactivation/run.py b/javae/test/IceE/adapterDeactivation/run.py index c3d0953bb9c..6b19831a593 100755 --- a/javae/test/IceE/adapterDeactivation/run.py +++ b/javae/test/IceE/adapterDeactivation/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "adapterDeactivation") testdir = os.path.join(toplevel, "test", name) diff --git a/javae/test/IceE/exceptions/run.py b/javae/test/IceE/exceptions/run.py index 9b981bc188e..8ad59c05439 100755 --- a/javae/test/IceE/exceptions/run.py +++ b/javae/test/IceE/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "exceptions") testdir = os.path.join(toplevel, "test", name) diff --git a/javae/test/IceE/facets/run.py b/javae/test/IceE/facets/run.py index 8b5eea6d41b..469fd1e3c04 100755 --- a/javae/test/IceE/facets/run.py +++ b/javae/test/IceE/facets/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "facets") testdir = os.path.join(toplevel, "test", name) diff --git a/javae/test/IceE/faultTolerance/run.py b/javae/test/IceE/faultTolerance/run.py index 7e2086229e1..0b21d1c7b0a 100755 --- a/javae/test/IceE/faultTolerance/run.py +++ b/javae/test/IceE/faultTolerance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "faultTolerance") testdir = os.path.join(toplevel, "test", name) diff --git a/javae/test/IceE/inheritance/run.py b/javae/test/IceE/inheritance/run.py index ec1018ff43d..5745d72f44b 100755 --- a/javae/test/IceE/inheritance/run.py +++ b/javae/test/IceE/inheritance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "inheritance") testdir = os.path.join(toplevel, "test", name) diff --git a/javae/test/IceE/location/run.py b/javae/test/IceE/location/run.py index c3943573d8c..0464a9b5825 100755 --- a/javae/test/IceE/location/run.py +++ b/javae/test/IceE/location/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "location") testdir = os.path.join(toplevel, "test", name) diff --git a/javae/test/IceE/operations/run.py b/javae/test/IceE/operations/run.py index baa75833d30..d79d8033c11 100755 --- a/javae/test/IceE/operations/run.py +++ b/javae/test/IceE/operations/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "operations") testdir = os.path.join(toplevel, "test", name) diff --git a/javae/test/IceE/package/run.py b/javae/test/IceE/package/run.py index 46918769a6e..2951795d3ab 100755 --- a/javae/test/IceE/package/run.py +++ b/javae/test/IceE/package/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "package") testdir = os.path.join(toplevel, "test", name) diff --git a/javae/test/IceE/proxy/run.py b/javae/test/IceE/proxy/run.py index 228855c9b19..9e26ce1a673 100755 --- a/javae/test/IceE/proxy/run.py +++ b/javae/test/IceE/proxy/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "proxy") testdir = os.path.join(toplevel, "test", name) diff --git a/javae/test/IceE/retry/run.py b/javae/test/IceE/retry/run.py index 06960673f62..f363df97b70 100755 --- a/javae/test/IceE/retry/run.py +++ b/javae/test/IceE/retry/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "retry") testdir = os.path.join(toplevel, "test", name) diff --git a/javae/test/IceE/slicing/run.py b/javae/test/IceE/slicing/run.py index c7727a0b2d5..683279cedb5 100755 --- a/javae/test/IceE/slicing/run.py +++ b/javae/test/IceE/slicing/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("IceE", "slicing") testdir = os.path.join(toplevel, "test", name) diff --git a/php/test/Ice/binding/run.py b/php/test/Ice/binding/run.py index 4740b351018..02f04424efa 100755 --- a/php/test/Ice/binding/run.py +++ b/php/test/Ice/binding/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "binding") diff --git a/php/test/Ice/exceptions/run.py b/php/test/Ice/exceptions/run.py index b24e861e651..aeab22f3a0a 100755 --- a/php/test/Ice/exceptions/run.py +++ b/php/test/Ice/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "exceptions") diff --git a/php/test/Ice/facets/run.py b/php/test/Ice/facets/run.py index 64c6fe59e43..2eef80e9011 100755 --- a/php/test/Ice/facets/run.py +++ b/php/test/Ice/facets/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "facets") diff --git a/php/test/Ice/inheritance/run.py b/php/test/Ice/inheritance/run.py index 4da6b18839a..74a707fc96b 100755 --- a/php/test/Ice/inheritance/run.py +++ b/php/test/Ice/inheritance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "inheritance") diff --git a/php/test/Ice/objects/run.py b/php/test/Ice/objects/run.py index 95a2b7d713f..6a961a01ef6 100755 --- a/php/test/Ice/objects/run.py +++ b/php/test/Ice/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "objects") diff --git a/php/test/Ice/operations/run.py b/php/test/Ice/operations/run.py index 0a42f35210f..e9e27457d59 100755 --- a/php/test/Ice/operations/run.py +++ b/php/test/Ice/operations/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "operations") diff --git a/php/test/Ice/proxy/run.py b/php/test/Ice/proxy/run.py index 80c381ad47d..ff506c96978 100755 --- a/php/test/Ice/proxy/run.py +++ b/php/test/Ice/proxy/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "proxy") diff --git a/php/test/Ice/slicing/exceptions/run.py b/php/test/Ice/slicing/exceptions/run.py index 0675e6b14fe..7716a243f26 100755 --- a/php/test/Ice/slicing/exceptions/run.py +++ b/php/test/Ice/slicing/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "exceptions") diff --git a/php/test/Ice/slicing/objects/run.py b/php/test/Ice/slicing/objects/run.py index d90291ad433..de3773f6762 100755 --- a/php/test/Ice/slicing/objects/run.py +++ b/php/test/Ice/slicing/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "objects") diff --git a/php/test/Slice/keyword/run.py b/php/test/Slice/keyword/run.py index caaf5db7fec..a92a5a7d39b 100755 --- a/php/test/Slice/keyword/run.py +++ b/php/test/Slice/keyword/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Slice", "keyword") diff --git a/py/test/Ice/adapterDeactivation/run.py b/py/test/Ice/adapterDeactivation/run.py index 00a823e7257..a094c546746 100755 --- a/py/test/Ice/adapterDeactivation/run.py +++ b/py/test/Ice/adapterDeactivation/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "adapterDeactivation") diff --git a/py/test/Ice/binding/run.py b/py/test/Ice/binding/run.py index 26eae48f410..a0304394366 100755 --- a/py/test/Ice/binding/run.py +++ b/py/test/Ice/binding/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "binding") diff --git a/py/test/Ice/blobject/run.py b/py/test/Ice/blobject/run.py index a28d328ea2b..0f23ed5db61 100755 --- a/py/test/Ice/blobject/run.py +++ b/py/test/Ice/blobject/run.py @@ -24,6 +24,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "blobject") diff --git a/py/test/Ice/checksum/run.py b/py/test/Ice/checksum/run.py index 7baaa591d14..65fc9c9621b 100755 --- a/py/test/Ice/checksum/run.py +++ b/py/test/Ice/checksum/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "checksum") diff --git a/py/test/Ice/custom/run.py b/py/test/Ice/custom/run.py index 7725b1ad957..c22501a2c9b 100755 --- a/py/test/Ice/custom/run.py +++ b/py/test/Ice/custom/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "custom") diff --git a/py/test/Ice/exceptions/run.py b/py/test/Ice/exceptions/run.py index 5a896c042e1..f5153ac8666 100755 --- a/py/test/Ice/exceptions/run.py +++ b/py/test/Ice/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "exceptions") diff --git a/py/test/Ice/facets/run.py b/py/test/Ice/facets/run.py index 6819bee9a27..b3afa6aeb5f 100755 --- a/py/test/Ice/facets/run.py +++ b/py/test/Ice/facets/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "facets") diff --git a/py/test/Ice/faultTolerance/run.py b/py/test/Ice/faultTolerance/run.py index 786e9b8c175..010134d2046 100755 --- a/py/test/Ice/faultTolerance/run.py +++ b/py/test/Ice/faultTolerance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "faultTolerance") testdir = os.path.join(toplevel, "py", "test", name) diff --git a/py/test/Ice/inheritance/run.py b/py/test/Ice/inheritance/run.py index 4891102c8f9..7ecff0e5ae5 100755 --- a/py/test/Ice/inheritance/run.py +++ b/py/test/Ice/inheritance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "inheritance") diff --git a/py/test/Ice/location/run.py b/py/test/Ice/location/run.py index be23e30ec16..177ebe2fb41 100755 --- a/py/test/Ice/location/run.py +++ b/py/test/Ice/location/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "location") diff --git a/py/test/Ice/objects/run.py b/py/test/Ice/objects/run.py index 6540f10fb9f..81b178ba4f4 100755 --- a/py/test/Ice/objects/run.py +++ b/py/test/Ice/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "objects") diff --git a/py/test/Ice/operations/run.py b/py/test/Ice/operations/run.py index f0c84d6e848..39ed6740919 100755 --- a/py/test/Ice/operations/run.py +++ b/py/test/Ice/operations/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "operations") diff --git a/py/test/Ice/proxy/run.py b/py/test/Ice/proxy/run.py index 5aec8be5734..2aa17f08bd3 100755 --- a/py/test/Ice/proxy/run.py +++ b/py/test/Ice/proxy/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "proxy") diff --git a/py/test/Ice/retry/run.py b/py/test/Ice/retry/run.py index 1872e2f2a0e..f0bc8d57120 100755 --- a/py/test/Ice/retry/run.py +++ b/py/test/Ice/retry/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "retry") diff --git a/py/test/Ice/servantLocator/run.py b/py/test/Ice/servantLocator/run.py index 48e7fb04b77..d8d4a2e1c73 100755 --- a/py/test/Ice/servantLocator/run.py +++ b/py/test/Ice/servantLocator/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "servantLocator") diff --git a/py/test/Ice/slicing/exceptions/run.py b/py/test/Ice/slicing/exceptions/run.py index ab63dcd9c6f..fd8cccc1533 100755 --- a/py/test/Ice/slicing/exceptions/run.py +++ b/py/test/Ice/slicing/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "exceptions") diff --git a/py/test/Ice/slicing/objects/run.py b/py/test/Ice/slicing/objects/run.py index 8f094a31773..65f973cda48 100755 --- a/py/test/Ice/slicing/objects/run.py +++ b/py/test/Ice/slicing/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "objects") diff --git a/py/test/Ice/timeout/run.py b/py/test/Ice/timeout/run.py index dde06549964..f04e73b903a 100755 --- a/py/test/Ice/timeout/run.py +++ b/py/test/Ice/timeout/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "timeout") diff --git a/py/test/Slice/keyword/run.py b/py/test/Slice/keyword/run.py index a9decea1379..1e8824ce002 100755 --- a/py/test/Slice/keyword/run.py +++ b/py/test/Slice/keyword/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/rb/test/Ice/binding/run.py b/rb/test/Ice/binding/run.py index 002273a8458..4be3edf8978 100755 --- a/rb/test/Ice/binding/run.py +++ b/rb/test/Ice/binding/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "binding") diff --git a/rb/test/Ice/checksum/run.py b/rb/test/Ice/checksum/run.py index cffd26b1337..3f26f43dab1 100755 --- a/rb/test/Ice/checksum/run.py +++ b/rb/test/Ice/checksum/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "checksum") diff --git a/rb/test/Ice/exceptions/run.py b/rb/test/Ice/exceptions/run.py index 4ed4ef30e2b..0b589e39bde 100755 --- a/rb/test/Ice/exceptions/run.py +++ b/rb/test/Ice/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "exceptions") diff --git a/rb/test/Ice/facets/run.py b/rb/test/Ice/facets/run.py index 6a5e366cb86..fc927877498 100755 --- a/rb/test/Ice/facets/run.py +++ b/rb/test/Ice/facets/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "facets") diff --git a/rb/test/Ice/inheritance/run.py b/rb/test/Ice/inheritance/run.py index e683120e5e2..338e3cfc4e3 100755 --- a/rb/test/Ice/inheritance/run.py +++ b/rb/test/Ice/inheritance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "inheritance") diff --git a/rb/test/Ice/location/run.py b/rb/test/Ice/location/run.py index 40dc4bf5e0e..29cba96aa87 100755 --- a/rb/test/Ice/location/run.py +++ b/rb/test/Ice/location/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "location") diff --git a/rb/test/Ice/objects/run.py b/rb/test/Ice/objects/run.py index 0ea4349ace7..38f7d8c91b8 100755 --- a/rb/test/Ice/objects/run.py +++ b/rb/test/Ice/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "objects") diff --git a/rb/test/Ice/operations/run.py b/rb/test/Ice/operations/run.py index f2ce08840c8..9e6c1ca4fc6 100755 --- a/rb/test/Ice/operations/run.py +++ b/rb/test/Ice/operations/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "operations") diff --git a/rb/test/Ice/proxy/run.py b/rb/test/Ice/proxy/run.py index d649f7b9cb2..765901ef2b8 100755 --- a/rb/test/Ice/proxy/run.py +++ b/rb/test/Ice/proxy/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "proxy") diff --git a/rb/test/Ice/retry/run.py b/rb/test/Ice/retry/run.py index 204a40b9c7c..68c7cc3dc5e 100755 --- a/rb/test/Ice/retry/run.py +++ b/rb/test/Ice/retry/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "retry") diff --git a/rb/test/Ice/slicing/exceptions/run.py b/rb/test/Ice/slicing/exceptions/run.py index 0675e6b14fe..7716a243f26 100755 --- a/rb/test/Ice/slicing/exceptions/run.py +++ b/rb/test/Ice/slicing/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "exceptions") diff --git a/rb/test/Ice/slicing/objects/run.py b/rb/test/Ice/slicing/objects/run.py index d90291ad433..de3773f6762 100755 --- a/rb/test/Ice/slicing/objects/run.py +++ b/rb/test/Ice/slicing/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "objects") diff --git a/rb/test/Ice/timeout/run.py b/rb/test/Ice/timeout/run.py index fd82869dadc..37bb863ea8e 100755 --- a/rb/test/Ice/timeout/run.py +++ b/rb/test/Ice/timeout/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "timeout") diff --git a/rb/test/Slice/keyword/run.py b/rb/test/Slice/keyword/run.py index 5e542295753..1ad9e674838 100755 --- a/rb/test/Slice/keyword/run.py +++ b/rb/test/Slice/keyword/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() testdir = os.path.dirname(os.path.abspath(__file__)) diff --git a/sl/test/IceCS/dictMapping/run.py b/sl/test/IceCS/dictMapping/run.py index 9685926ee6d..8ddad2c1793 100755 --- a/sl/test/IceCS/dictMapping/run.py +++ b/sl/test/IceCS/dictMapping/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "dictMapping") diff --git a/sl/test/IceCS/exceptions/run.py b/sl/test/IceCS/exceptions/run.py index baeac7968f4..de9d9432add 100755 --- a/sl/test/IceCS/exceptions/run.py +++ b/sl/test/IceCS/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "exceptions") diff --git a/sl/test/IceCS/facets/run.py b/sl/test/IceCS/facets/run.py index e367ce00658..db93b92f5a6 100755 --- a/sl/test/IceCS/facets/run.py +++ b/sl/test/IceCS/facets/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "facets") diff --git a/sl/test/IceCS/inheritance/run.py b/sl/test/IceCS/inheritance/run.py index 3cd432f8f23..cd78ff14251 100755 --- a/sl/test/IceCS/inheritance/run.py +++ b/sl/test/IceCS/inheritance/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "inheritance") diff --git a/sl/test/IceCS/objects/run.py b/sl/test/IceCS/objects/run.py index d509a86aca8..385ca8ae9fa 100755 --- a/sl/test/IceCS/objects/run.py +++ b/sl/test/IceCS/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "objects") diff --git a/sl/test/IceCS/operations/run.py b/sl/test/IceCS/operations/run.py index da1a693ce7c..8c2e653655b 100755 --- a/sl/test/IceCS/operations/run.py +++ b/sl/test/IceCS/operations/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "operations") diff --git a/sl/test/IceCS/proxy/run.py b/sl/test/IceCS/proxy/run.py index e5efcda822e..173bf196c98 100755 --- a/sl/test/IceCS/proxy/run.py +++ b/sl/test/IceCS/proxy/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "proxy") diff --git a/sl/test/IceCS/retry/run.py b/sl/test/IceCS/retry/run.py index 22fa8cf23f5..bc034fbcf13 100755 --- a/sl/test/IceCS/retry/run.py +++ b/sl/test/IceCS/retry/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "retry") diff --git a/sl/test/IceCS/seqMapping/run.py b/sl/test/IceCS/seqMapping/run.py index 5b4edc835c2..73a82cd81cb 100755 --- a/sl/test/IceCS/seqMapping/run.py +++ b/sl/test/IceCS/seqMapping/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "seqMapping") diff --git a/sl/test/IceCS/slicing/exceptions/run.py b/sl/test/IceCS/slicing/exceptions/run.py index 2b6706082c0..d3d63623565 100755 --- a/sl/test/IceCS/slicing/exceptions/run.py +++ b/sl/test/IceCS/slicing/exceptions/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "exceptions") diff --git a/sl/test/IceCS/slicing/objects/run.py b/sl/test/IceCS/slicing/objects/run.py index 8db1c65a980..4d4d752c7d8 100755 --- a/sl/test/IceCS/slicing/objects/run.py +++ b/sl/test/IceCS/slicing/objects/run.py @@ -19,6 +19,7 @@ else: sys.path.append(os.path.join(toplevel, "config")) import TestUtil +TestUtil.processCmdLine() name = os.path.join("Ice", "slicing", "objects") |