diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-11-05 20:44:59 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-11-05 20:44:59 +0100 |
| commit | 4fcad5bfd99b54e6843d4f071bd2a1fee8db0f71 (patch) | |
| tree | 24d56924a4107fa651636f07998b3f18be531d22 /scripts/Util.py | |
| parent | Fixed macOS IceGridGUI App build issue (diff) | |
| download | ice-4fcad5bfd99b54e6843d4f071bd2a1fee8db0f71.tar.bz2 ice-4fcad5bfd99b54e6843d4f071bd2a1fee8db0f71.tar.xz ice-4fcad5bfd99b54e6843d4f071bd2a1fee8db0f71.zip | |
Another fix for the Debian/Ubuntu bogus JDK 1.8
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index a34c9b78e06..817fd8803bf 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -3153,8 +3153,12 @@ class JavaMapping(Mapping): def getCommandLine(self, current, process, exe, args): javaHome = os.getenv("JAVA_HOME", "") java = os.path.join(javaHome, "bin", "java") if javaHome else "java" + javaArgs = self.getJavaArgs(process, current) if process.isFromBinDir(): - return "{0} -ea {1} {2}".format(java, exe, args) + if javaArgs: + return "{0} -ea {1} {2} {3}".format(java, javaArgs, exe, args) + else: + return "{0} -ea {1} {2}".format(java, exe, args) testdir = self.component.getTestDir(self) assert(current.testcase.getPath(current).startswith(testdir)) @@ -3166,6 +3170,9 @@ class JavaMapping(Mapping): return "{0} -ea -Dtest.class={1}.{2} test.TestDriver {3}".format(java, package, exe, args) def getJavaArgs(self, process, current): + # TODO: WORKAROUND for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925 + if isinstance(platform, Linux) and platform.getLinuxId() in ["debian", "ubuntu"]: + return ["-Djdk.net.URLClassPath.disableClassPathURLCheck=true"] return [] def getSSLProps(self, process, current): |