Filter out ObjectSpace specs if ObjectSpace is disabled.

calavera · Oct 30, 2009 · f3b1158 · f3b1158
1 parent d7e5666
commit f3b1158
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/spec/jruby.1.8.mspec b/spec/jruby.1.8.mspec
@@ -3,6 +3,7 @@
 # detect windows platform:
 require 'rbconfig'
 require 'java'
+require 'jruby'
 
 IKVM = java.lang.System.get_property('java.vm.name') =~ /IKVM\.NET/
 
@@ -14,13 +15,21 @@ class MSpecScript
   set :language, [ SPEC_DIR + '/language' ]
 
   # Core library specs
-  set :core, [
+  CORE_DIRS = [
     SPEC_DIR + '/core',
 
     # 1.9
     '^' + SPEC_DIR + '/core/basicobject'
   ]
 
+  # Filter out ObjectSpace specs if ObjectSpace is disabled
+  unless JRuby.objectspace
+    CORE_DIRS << '^' + SPEC_DIR + '/core/objectspace/_id2ref'
+    CORE_DIRS << '^' + SPEC_DIR + '/core/objectspace/each_object'
+  end
+
+  set :core, CORE_DIRS
+
   if IKVM
     # ftype_spec freezes for some reason under IKVM
     set(:core, get(:core) + ['^' + SPEC_DIR + '/core/file'])

diff --git a/spec/tags/1.8/ruby/core/objectspace/each_object_tags.txt b/spec/tags/1.8/ruby/core/objectspace/each_object_tags.txt