diff options
| author | Joe George <joe@zeroc.com> | 2016-08-25 16:48:28 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-08-25 16:48:28 -0400 |
| commit | 231f5b68b410d295b7a83ac5c10e319d315302dc (patch) | |
| tree | 26f9bc76c9f6b5e5090f108b17cdcb50b3336b24 /scripts/TestUtil.py | |
| parent | Fix C# Ice/slicing/objects project (diff) | |
| download | ice-231f5b68b410d295b7a83ac5c10e319d315302dc.tar.bz2 ice-231f5b68b410d295b7a83ac5c10e319d315302dc.tar.xz ice-231f5b68b410d295b7a83ac5c10e319d315302dc.zip | |
Fix TestUtil sometimes testing es5 when it should not
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 88d8604d0dd..255e118f888 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -2299,7 +2299,7 @@ def runTests(start, expanded, num = 0, script = False): dir = os.path.join(testToplevel, "java", "test", "src", "main", i) elif i.find(os.path.join("java-compat","test")) != -1: dir = os.path.join(testToplevel, "java-compat", "test", "src", "main", i.replace('-compat','')) - elif i.find(os.path.join("js","test")) != -1: + elif es5 and i.find(os.path.join("js","test")) != -1: dir = os.path.join(testToplevel, i.replace("test/Ice/", "test/Ice/es5/") .replace("test/Glacier2/", "test/Glacier2/es5/")) else: |