diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-06-13 14:10:16 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-06-13 14:10:16 -0700 |
| commit | 207d518ba33c1d802ad3f3dbdb9a5fa80ad9037a (patch) | |
| tree | b26e87495ed748d46269e0d9563e575401729057 /scripts/Util.py | |
| parent | js/Ice/exception fixes to print exception that causes the failure (diff) | |
| download | ice-207d518ba33c1d802ad3f3dbdb9a5fa80ad9037a.tar.bz2 ice-207d518ba33c1d802ad3f3dbdb9a5fa80ad9037a.tar.xz ice-207d518ba33c1d802ad3f3dbdb9a5fa80ad9037a.zip | |
Java & Android test fixes
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index bb153ab29e6..43edc6642f8 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -682,6 +682,7 @@ class Mapping: @classmethod def add(self, name, mapping): + name = name.replace("\\", "/") self.mappings[name] = mapping.init(name) @classmethod @@ -698,7 +699,7 @@ class Mapping: def init(self, name): self.name = name if not self.path: - self.path = os.path.join(toplevel, name) + self.path = os.path.normpath(os.path.join(toplevel, name)) return self def __str__(self): @@ -2793,6 +2794,10 @@ class Android: "Ice/binding", "Ice/timeout", "Ice/udp"] + if protocol in ["bt", "bts"]: + tests += [ + "Ice/info", + "Ice/udp"] return tests class AndroidMapping(JavaMapping): @@ -3235,8 +3240,8 @@ for m in filter(lambda x: os.path.isdir(os.path.join(toplevel, x)), os.listdir( Mapping.add(m, ObjCMapping()) if hasAndroidSDK: - Mapping.add("java-compat/android", AndroidCompatMapping()) - Mapping.add("java/android", AndroidMapping()) + Mapping.add(os.path.join("java-compat", "android"), AndroidCompatMapping()) + Mapping.add(os.path.join("java", "android"), AndroidMapping()) def runTestsWithPath(path): runTests([Mapping.getByPath(path)]) |