Mercurial > hg > truffle
diff mxtool/mx.py @ 13951:392b6ac8da36
Allow using run_java without the arguments from -J -Ja -Jp. Factor out the argument processing of mx_graal.vm and use it to pass tested-vm args down through the jmh harness
| author | Bernhard Urban <bernhard.urban@jku.at> |
|---|---|
| date | Thu, 13 Feb 2014 17:59:27 +0100 |
| parents | 35783e78eaef |
| children | b076b5c13c3f |
line wrap: on
line diff
--- a/mxtool/mx.py Thu Feb 13 17:07:36 2014 +0100 +++ b/mxtool/mx.py Thu Feb 13 17:59:27 2014 +0100 @@ -1053,8 +1053,8 @@ assert _java is not None return _java -def run_java(args, nonZeroIsFatal=True, out=None, err=None, cwd=None): - return run(java().format_cmd(args), nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd) +def run_java(args, nonZeroIsFatal=True, out=None, err=None, cwd=None, addDefaultArgs=True): + return run(java().format_cmd(args, addDefaultArgs), nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd) def _kill_process_group(pid): pgid = os.getpgid(pid) @@ -1333,8 +1333,11 @@ if self.debug_port is not None: self.java_args += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(self.debug_port)] - def format_cmd(self, args): - return [self.java] + self.java_args_pfx + self.java_args + self.java_args_sfx + args + def format_cmd(self, args, addDefaultArgs): + if addDefaultArgs: + return [self.java] + self.java_args_pfx + self.java_args + self.java_args_sfx + args + else: + return [self.java] + args def bootclasspath(self): if self._bootclasspath is None: