changeset 15575:cb2f3c49deb2

mx unittest: compile junitwrapper with right classpath
author Bernhard Urban <bernhard.urban@jku.at>
date Fri, 09 May 2014 13:21:43 +0200
parents d79501a10e5b
children 0c0b479903bb
files mx/mx_graal.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Fri May 09 15:55:37 2014 +0200
+++ b/mx/mx_graal.py	Fri May 09 13:21:43 2014 +0200
@@ -959,15 +959,18 @@
         (_, testfile) = tempfile.mkstemp(".testclasses", "graal")
         os.close(_)
     corecp = mx.classpath(['com.oracle.graal.test'])
+
+    if not exists(javaClass) or getmtime(javaClass) < getmtime(javaSource):
+        subprocess.check_call([mx.java().javac, '-cp', corecp, '-d', mxdir, javaSource])
+
     coreArgs = []
     if verbose:
         coreArgs.append('-JUnitVerbose')
     if enable_timing:
         coreArgs.append('-JUnitEnableTiming')
 
+
     def harness(projectscp, vmArgs):
-        if not exists(javaClass) or getmtime(javaClass) < getmtime(javaSource):
-            subprocess.check_call([mx.java().javac, '-cp', projectscp, '-d', mxdir, javaSource])
         if _get_vm() != 'graal':
             prefixArgs = ['-esa', '-ea']
         else: