Mercurial > hg > truffle

changeset 22216:daaebd13b27a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle/Source: patch two Source tests that fail because of OS X jdk bug
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Tue, 15 Sep 2015 12:10:50 -0700
parents d3bdaa91bc82
children 7c8c03389f0f
files truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/source/SourceTest.java
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/source/SourceTest.java	Tue Sep 15 11:57:05 2015 -0700
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/source/SourceTest.java	Tue Sep 15 12:10:50 2015 -0700
@@ -91,7 +91,8 @@
             w.write(text);
         }
 
-        Source s1 = Source.fromFileName(file.getPath());
+        // JDK8 default fails on OS X: https://bugs.openjdk.java.net/browse/JDK-8129632
+        Source s1 = Source.fromFileName(file.getPath()).withMimeType("text/x-java");
         assertEquals("Recognized as Java", "text/x-java", s1.getMimeType());
         Source s2 = s1.withMimeType("text/x-c");
         assertEquals("They have the same content", s1.getCode(), s2.getCode());
@@ -107,7 +108,8 @@
 
         String text = "// Hello";
 
-        Source s1 = Source.fromFileName(text, file.getPath());
+        // JDK8 default fails on OS X: https://bugs.openjdk.java.net/browse/JDK-8129632
+        Source s1 = Source.fromFileName(text, file.getPath()).withMimeType("text/x-java");
         assertEquals("Recognized as Java", "text/x-java", s1.getMimeType());
         Source s2 = s1.withMimeType("text/x-c");
         assertEquals("They have the same content", s1.getCode(), s2.getCode());