Mercurial > hg > truffle
diff mx/mx_graal.py @ 15500:f2132fab8a6f
Add custom GraalJUnitCore.
| author | Josef Eisl <josef.eisl@jku.at> |
|---|---|
| date | Mon, 05 May 2014 11:33:33 +0200 |
| parents | f73fc9309f12 |
| children | a26be2c9b81b |
line wrap: on
line diff
--- a/mx/mx_graal.py Mon May 05 11:55:34 2014 +0200 +++ b/mx/mx_graal.py Mon May 05 11:33:33 2014 +0200 @@ -955,6 +955,7 @@ if testfile is None: (_, testfile) = tempfile.mkstemp(".testclasses", "graal") os.close(_) + corecp = mx.classpath(['com.oracle.graal.test']) def harness(projectscp, vmArgs): if not exists(javaClass) or getmtime(javaClass) < getmtime(javaSource): @@ -968,9 +969,9 @@ if len(testclasses) == 1: # Execute Junit directly when one test is being run. This simplifies # replaying the VM execution in a native debugger (e.g., gdb). - vm(prefixArgs + vmArgs + ['-cp', prefixcp + projectscp, 'org.junit.runner.JUnitCore'] + testclasses) + vm(prefixArgs + vmArgs + ['-cp', prefixcp + corecp + ':' + projectscp, 'com.oracle.graal.test.GraalJUnitCore'] + testclasses) else: - vm(prefixArgs + vmArgs + ['-cp', prefixcp + projectscp + os.pathsep + mxdir, name] + [testfile]) + vm(prefixArgs + vmArgs + ['-cp', prefixcp + corecp + ':' + projectscp + os.pathsep + mxdir, name] + [testfile]) try: _run_tests(args, harness, annotations, testfile, whitelist)