Mercurial > hg > truffle

comparison mxtool/mx.py @ 13951:392b6ac8da36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
13950:35783e78eaef 13951:392b6ac8da36
1051 Get a JavaConfig object containing Java commands launch details. 1051 Get a JavaConfig object containing Java commands launch details.
1052 """ 1052 """
1053 assert _java is not None 1053 assert _java is not None
1054 return _java 1054 return _java
1055 1055
1056 def run_java(args, nonZeroIsFatal=True, out=None, err=None, cwd=None): 1056 def run_java(args, nonZeroIsFatal=True, out=None, err=None, cwd=None, addDefaultArgs=True):
1057 return run(java().format_cmd(args), nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd) 1057 return run(java().format_cmd(args, addDefaultArgs), nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
1058 1058
1059 def _kill_process_group(pid): 1059 def _kill_process_group(pid):
1060 pgid = os.getpgid(pid) 1060 pgid = os.getpgid(pid)
1061 try: 1061 try:
1062 os.killpg(pgid, signal.SIGKILL) 1062 os.killpg(pgid, signal.SIGKILL)
1331 self.javaCompliance = JavaCompliance(self.version.versionString) 1331 self.javaCompliance = JavaCompliance(self.version.versionString)
1332 1332
1333 if self.debug_port is not None: 1333 if self.debug_port is not None:
1334 self.java_args += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(self.debug_port)] 1334 self.java_args += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(self.debug_port)]
1335 1335
1336 def format_cmd(self, args): 1336 def format_cmd(self, args, addDefaultArgs):
1337 return [self.java] + self.java_args_pfx + self.java_args + self.java_args_sfx + args 1337 if addDefaultArgs:
1338 return [self.java] + self.java_args_pfx + self.java_args + self.java_args_sfx + args
1339 else:
1340 return [self.java] + args
1338 1341
1339 def bootclasspath(self): 1342 def bootclasspath(self):
1340 if self._bootclasspath is None: 1343 if self._bootclasspath is None:
1341 tmpDir = tempfile.mkdtemp() 1344 tmpDir = tempfile.mkdtemp()
1342 try: 1345 try: