Mercurial > hg > truffle

changeset 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 3af9abd4d524
files mx/mx_graal.py mxtool/mx.py
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Thu Oct 16 17:07:38 2014 +0200
+++ b/mx/mx_graal.py	Thu Oct 16 08:51:26 2014 -0700
@@ -1185,9 +1185,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', cp, 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + testclasses)
+            vm(prefixArgs + vmArgs + ['-cp', mx._separatedCygpathU2W(cp), 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + testclasses)
         else:
-            vm(prefixArgs + vmArgs + ['-cp', cp, 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + ['@' + mx._cygpathU2W(testfile)])
+            vm(prefixArgs + vmArgs + ['-cp', mx._separatedCygpathU2W(cp), 'com.oracle.graal.test.GraalJUnitCore'] + coreArgs + ['@' + mx._cygpathU2W(testfile)])
 
     try:
         _run_tests(args, harness, annotations, testfile, blacklist, whitelist, regex)
@@ -2256,7 +2256,7 @@
     cmd = ['-jar', mx._cygpathU2W(findbugsJar), '-textui', '-low', '-maxRank', '15']
     if sys.stdout.isatty():
         cmd.append('-progress')
-    cmd = cmd + ['-auxclasspath', mx.classpath([d.name for d in _jdkDeployedDists] + [p.name for p in nonTestProjects]), '-output', mx._cygpathU2W(findbugsResults), '-exitcode'] + args + outputDirs
+    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
     exitcode = mx.run_java(cmd, nonZeroIsFatal=False)
     if exitcode != 0:
         with open(findbugsResults) as fp:
--- a/mxtool/mx.py	Thu Oct 16 17:07:38 2014 +0200
+++ b/mxtool/mx.py	Thu Oct 16 08:51:26 2014 -0700
@@ -1572,7 +1572,7 @@
     if includeBootClasspath:
         result = os.pathsep.join([java().bootclasspath(), result])
 
-    return _separatedCygpathU2W(result)
+    return result
 
 def classpath_walk(names=None, resolve=True, includeSelf=True, includeBootClasspath=False):
     """
@@ -2366,7 +2366,7 @@
         jdk = self.jdk
         outputDir = _cygpathU2W(self.outputDir)
         compliance = str(jdk.javaCompliance)
-        cp = classpath(self.proj.name, includeSelf=True)
+        cp = _separatedCygpathU2W(classpath(self.proj.name, includeSelf=True))
         toBeDeleted = [argfileName]
 
         try: