omit jrubyc for embedded tests. activate objectspace tests for embedded

jruby · Jul 8, 2015 · 5590aa1 · 5590aa1
1 parent e165d8b
commit 5590aa1
Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/maven/jruby-jars/src/it/extended/src/test/java/org/example/SimpleTest.java b/maven/jruby-jars/src/it/extended/src/test/java/org/example/SimpleTest.java
@@ -52,6 +52,7 @@ private void collectTests(ScriptingContainer container, String index) throws Exc
 "        next if filename =~ /psych\\/test_nil.rb/\n" +
 	 // TODO file an issue or so
 "        next if filename =~ /test_load_compiled_ruby.rb/\n" +
+"        next if filename =~ /compiler\\/test_jrubyc.rb/\n" +
          // TODO remove the following after fix of #2215
 "        next if filename =~ /test_jar_on_load_path.rb/\n" +
 "        next if filename =~ /test_file.rb/\n" +
@@ -86,11 +87,10 @@ private void runIt(String index, String script) throws Exception {
     // 	runIt(null, "require '/home/christian/projects/active/maven/jruby/test/jruby/test_command_line_switches.rb'");
     // }
 
-    // does not seem to pass at all
-    // @Test
-    // public void testObjectspace() throws Exception {
-    // 	runIt("objectspace");
-    // }
+    @Test
+    public void testObjectspace() throws Exception {
+    	runIt("objectspace");
+    }
 
     @Test
     public void testMRI() throws Exception {

diff --git a/maven/jruby/src/it/extended/src/test/java/org/example/SimpleTest.java b/maven/jruby/src/it/extended/src/test/java/org/example/SimpleTest.java
@@ -54,6 +54,7 @@ private void collectTests(ScriptingContainer container, String index) throws Exc
 "        next if filename =~ /psych\\/test_nil.rb/\n" +
 	 // TODO file an issue or so
 "        next if filename =~ /test_load_compiled_ruby.rb/\n" +
+"        next if filename =~ /compiler\\/test_jrubyc.rb/\n" +
          // TODO remove the following after fix of #2215
 "        next if filename =~ /test_jar_on_load_path.rb/\n" +
 "        next if filename =~ /test_file.rb/\n" +
@@ -88,11 +89,10 @@ private void runIt(String index, String script) throws Exception {
     // 	runIt(null, "require '/home/christian/projects/active/maven/jruby/test/jruby/test_command_line_switches.rb'");
     // }
 
-    // does not seem to pass at all
-    // @Test
-    // public void testObjectspace() throws Exception {
-    // 	runIt("objectspace");
-    // }
+    @Test
+    public void testObjectspace() throws Exception {
+    	runIt("objectspace");
+    }
 
     @Test
     public void testMRI() throws Exception {