diff options
Diffstat (limited to 'cs/allTests.py')
| -rwxr-xr-x | cs/allTests.py | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/cs/allTests.py b/cs/allTests.py index 139784f0fc6..03b8c6ec20f 100755 --- a/cs/allTests.py +++ b/cs/allTests.py @@ -40,22 +40,22 @@ def runTests(args, tests, num = 0): # for i in tests: - i = os.path.normpath(i) - dir = os.path.join(toplevel, "test", i) + i = os.path.normpath(i) + dir = os.path.join(toplevel, "test", i) - print - if(num > 0): - print "[" + str(num) + "]", - print "*** running tests in " + dir, - print + print + if(num > 0): + print "[" + str(num) + "]", + print "*** running tests in " + dir, + print - status = os.system("python " + os.path.join(dir, "run.py " + args)) + status = os.system("python " + 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) + 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. @@ -92,7 +92,7 @@ def usage(): try: opts, args = getopt.getopt(sys.argv[1:], "lmr:R:", \ - ["mono", "debug", "protocol=", "compress", "host=", "threadPerConnection"]) + ["mono", "debug", "protocol=", "compress", "host=", "threadPerConnection"]) except getopt.GetoptError: usage() @@ -106,24 +106,24 @@ for o, a in opts: if o == "-l": loop = 1 if o == "-r" or o == '-R': - import re - regexp = re.compile(a) - if o == '-r': - def rematch(x): return regexp.search(x) - else: - def rematch(x): return not regexp.search(x) - tests = filter(rematch, tests) + import re + regexp = re.compile(a) + if o == '-r': + def rematch(x): return regexp.search(x) + else: + def rematch(x): return not regexp.search(x) + tests = filter(rematch, tests) if o == "--protocol": - if a not in ( "ssl", "tcp"): - usage() - args += " " + o + " " + a + if a not in ( "ssl", "tcp"): + usage() + args += " " + o + " " + a if o == "--host" : - args += " " + o + " " + a + args += " " + o + " " + a if o in ( "-m", "--mono" ): - args += " " + o + args += " " + o mono = 1 if o in ( "--debug", "-m", "--mono", "--compress", "--threadPerConnection" ): - args += " " + o + args += " " + o if not isWin32(): mono = 1 @@ -136,7 +136,7 @@ if not mono: if loop: num = 1 while 1: - runTests(args, tests, num) - num += 1 + runTests(args, tests, num) + num += 1 else: runTests(args, tests) |