Mercurial > hg > truffle

comparison mx/mx_graal.py @ 18116:c4f649042a7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx/unittest: fix cygwin path issue
author Bernhard Urban <bernhard.urban@jku.at>
date Thu, 16 Oct 2014 08:51:26 -0700
parents 4ccabc85a62a
children c88ab4f1f04a
comparison
equal deleted inserted replaced
18115:4ccabc85a62a 18116:c4f649042a7b
1183 vmArgs = ['-XX:-UseGraalClassLoader'] + vmArgs 1183 vmArgs = ['-XX:-UseGraalClassLoader'] + vmArgs
1184 1184
1185 if len(testclasses) == 1: 1185 if len(testclasses) == 1:
1186 # Execute Junit directly when one test is being run. This simplifies 1186 # Execute Junit directly when one test is being run. This simplifies
1187 # replaying the VM execution in a native debugger (e.g., gdb). 1187 # replaying the VM execution in a native debugger (e.g., gdb).
1188 vm(prefixArgs + vmArgs + ['-cp', cp, 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + testclasses) 1188 vm(prefixArgs + vmArgs + ['-cp', mx._separatedCygpathU2W(cp), 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + testclasses)
1189 else: 1189 else:
1190 vm(prefixArgs + vmArgs + ['-cp', cp, 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + ['@' + mx._cygpathU2W(testfile)]) 1190 vm(prefixArgs + vmArgs + ['-cp', mx._separatedCygpathU2W(cp), 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + ['@' + mx._cygpathU2W(testfile)])
1191 1191
1192 try: 1192 try:
1193 _run_tests(args, harness, annotations, testfile, blacklist, whitelist, regex) 1193 _run_tests(args, harness, annotations, testfile, blacklist, whitelist, regex)
1194 finally: 1194 finally:
1195 if os.environ.get('MX_TESTFILE') is None: 1195 if os.environ.get('MX_TESTFILE') is None:
2254 findbugsResults = join(_graal_home, 'findbugs.results') 2254 findbugsResults = join(_graal_home, 'findbugs.results')
2255 2255
2256 cmd = ['-jar', mx._cygpathU2W(findbugsJar), '-textui', '-low', '-maxRank', '15'] 2256 cmd = ['-jar', mx._cygpathU2W(findbugsJar), '-textui', '-low', '-maxRank', '15']
2257 if sys.stdout.isatty(): 2257 if sys.stdout.isatty():
2258 cmd.append('-progress') 2258 cmd.append('-progress')
2259 cmd = cmd + ['-auxclasspath', mx.classpath([d.name for d in _jdkDeployedDists] + [p.name for p in nonTestProjects]), '-output', mx._cygpathU2W(findbugsResults), '-exitcode'] + args + outputDirs 2259 cmd = cmd + ['-auxclasspath', mx._separatedCygpathU2W(mx.classpath([d.name for d in _jdkDeployedDists] + [p.name for p in nonTestProjects])), '-output', mx._cygpathU2W(findbugsResults), '-exitcode'] + args + outputDirs
2260 exitcode = mx.run_java(cmd, nonZeroIsFatal=False) 2260 exitcode = mx.run_java(cmd, nonZeroIsFatal=False)
2261 if exitcode != 0: 2261 if exitcode != 0:
2262 with open(findbugsResults) as fp: 2262 with open(findbugsResults) as fp:
2263 mx.log(fp.read()) 2263 mx.log(fp.read())
2264 os.unlink(findbugsResults) 2264 os.unlink(findbugsResults)