diff options
| -rwxr-xr-x | allTests.py | 2 | ||||
| -rwxr-xr-x | scripts/TestUtil.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/allTests.py b/allTests.py index a0ddb11c660..ec63af28751 100755 --- a/allTests.py +++ b/allTests.py @@ -30,7 +30,7 @@ for d in languages: tests = [] - tests = [ (os.path.join(d, "test", x), y) for x, y in current_mod.tests ] + tests = [ (os.path.join(d, "test", os.path.normpath(x)), y) for x, y in current_mod.tests ] if len(tests) > 0: testGroups.extend(tests) diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 1eae8cdd77a..7ddb77922a9 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -505,7 +505,7 @@ def run(tests, root = False): elif o in ("-l", "--loop"): loop = True elif o in ("-r", "-R", "--filter", '--rfilter'): - testFilter = re.compile(a) + testFilter = re.compile(re.escape(os.path.normpath(a))) if o in ("--rfilter", "-R"): filters.append((testFilter, True)) else: @@ -560,7 +560,7 @@ def run(tests, root = False): arg += " " + a if not root: - tests = [ (os.path.join(getDefaultMapping(), "test", x), y) for x, y in tests ] + tests = [ (os.path.join(getDefaultMapping(), "test", os.path.normpath(x)), y) for x, y in tests ] # Expand all the tests and argument combinations. expanded = [] @@ -626,14 +626,14 @@ def run(tests, root = False): for c in crossLang: a = "--cross=%s --protocol=tcp %s" % (c, arg) for test in crossTests: - name = "%s/test/%s" % (lang, test) + name = os.path.join(lang, "test", test) expanded.append([(name, a, testConfig(name, tests))]) # Add ssl & compress for the operations test. if ((compact or mono) and c == "csharp") or (c == "js"): # Don't add the ssl tests. continue a = "--cross=%s --protocol=ssl --compress %s" % (c, arg) - expanded.append([("%s/test/Ice/operations" % lang, a, [])]) + expanded.append([(os.path.join(lang, "test", "Ice", "operations"), a, [])]) # Apply filters after expanding. if len(filters) > 0: |