diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-12-19 12:17:47 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-19 12:17:47 +0100 |
| commit | 441f2b911949cb56a6e73a97ce40fca38725e1f3 (patch) | |
| tree | 9100658f4be1cdc940d8400d8d718064da3179f4 /scripts/Util.py | |
| parent | Allow flex/bison flags at the project level (diff) | |
| download | ice-441f2b911949cb56a6e73a97ce40fca38725e1f3.tar.bz2 ice-441f2b911949cb56a6e73a97ce40fca38725e1f3.tar.xz ice-441f2b911949cb56a6e73a97ce40fca38725e1f3.zip | |
Support for specifying Java args with test scripts
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 77a98fd0cc4..17d928db096 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2183,7 +2183,14 @@ class JavaMapping(Mapping): assert(current.testcase.getPath().startswith(self.getTestsPath())) package = "test." + current.testcase.getPath()[len(self.getTestsPath()) + 1:].replace(os.sep, ".") - return "{0} {1}.{2}".format(java, package, exe) + javaArgs = self.getJavaArgs(process, current) + if javaArgs: + return "{0} {1} {2}.{3}".format(java, " ".join(javaArgs), package, exe) + else: + return "{0} {1}.{2}".format(java, package, exe) + + def getJavaArgs(self, process, current): + return [] def getSSLProps(self, process, current): props = Mapping.getSSLProps(self, process, current) |