[macruby-changes] [1467] MacRuby/branches/experimental

[source_changes at macosforge.org]

Revision: 1467
          http://trac.macosforge.org/projects/ruby/changeset/1467
Author:   eloy.de.enige at gmail.com
Date:     2009-04-22 15:40:07 -0700 (Wed, 22 Apr 2009)
Log Message:
-----------
Moved macruby.mspec script out of frozen RubySpec dir as well and added the MacRuby only specs run with spec:ci as well.

Modified Paths:
--------------
    MacRuby/branches/experimental/rakelib/spec.rake

Added Paths:
-----------
    MacRuby/branches/experimental/spec/macruby.mspec

Removed Paths:
-------------
    MacRuby/branches/experimental/spec/frozen/macruby.mspec

Modified: MacRuby/branches/experimental/rakelib/spec.rake
===================================================================
--- MacRuby/branches/experimental/rakelib/spec.rake	2009-04-22 22:27:33 UTC (rev 1466)
+++ MacRuby/branches/experimental/rakelib/spec.rake	2009-04-22 22:40:07 UTC (rev 1467)
@@ -53,6 +53,8 @@
   
   KNOWN_GOOD_CORE_IO_FILES = FileList["spec/frozen/core/io/{#{KNOWN_GOOD_CORE_IO.join(',')}}_spec.rb"]
   
+  MACRUBY_MSPEC = "./spec/macruby.mspec"
+  
   desc "Run all language known good spec files which should be fully green (does not use tags)"
   task :green do
     files = FileList["spec/frozen/language/{#{KNOWN_GOOD.join(',')}}_spec.rb"]
@@ -67,12 +69,12 @@
   
   desc "Run continuous integration language examples (all known good examples)"
   task :ci do
-    sh "./mspec/bin/mspec ci -B ./spec/frozen/macruby.mspec spec/frozen/language #{KNOWN_GOOD_CORE_IO_FILES.join(' ')}"
+    sh "./mspec/bin/mspec ci -B #{MACRUBY_MSPEC} spec/macruby spec/frozen/language #{KNOWN_GOOD_CORE_IO_FILES.join(' ')}"
   end
   
   desc "Run continuous integration language examples (all known good examples) (32 bit mode)"
   task :ci32 do
-    sh "/usr/bin/arch -arch i386 ./miniruby ./mspec/bin/mspec-ci -B ./spec/frozen/macruby.mspec spec/frozen/language #{KNOWN_GOOD_CORE_IO_FILES.join(' ')}"
+    sh "/usr/bin/arch -arch i386 ./miniruby ./mspec/bin/mspec-ci -B #{MACRUBY_MSPEC} spec/frozen/language #{KNOWN_GOOD_CORE_IO_FILES.join(' ')}"
   end
   
   desc "Run IO test with GDB enabled"
@@ -87,12 +89,12 @@
   
   desc "Run all MacRuby-only specs"
   task :macruby do
-    sh "./mspec/bin/mspec run -t ./miniruby ./spec/macruby"
+    sh "./mspec/bin/mspec run -B #{MACRUBY_MSPEC} ./spec/macruby"
   end
   
   desc "Run language examples that are known to fail"
   task :fails do
-    sh "./mspec/bin/mspec run -g fails -B ./spec/frozen/macruby.mspec spec/frozen/language"
+    sh "./mspec/bin/mspec run -g fails -B #{MACRUBY_MSPEC} spec/frozen/language"
   end
   
   %w{ fails critical }.each do |tag|

Deleted: MacRuby/branches/experimental/spec/frozen/macruby.mspec
===================================================================
--- MacRuby/branches/experimental/spec/frozen/macruby.mspec	2009-04-22 22:27:33 UTC (rev 1466)
+++ MacRuby/branches/experimental/spec/frozen/macruby.mspec	2009-04-22 22:40:07 UTC (rev 1467)
@@ -1,58 +0,0 @@
-class MSpecScript
-  # Language features specs
-  set :language, [ 'language' ]
-
-  # Core library specs
-  set :core, [ 'core' ]
-
-  # Standard library specs
-  set :library, [
-    'library',
-
-    # obsolete libraries
-    '^library/cgi-lib',
-    '^library/date2',
-    '^library/eregex',
-    '^library/finalize',
-    '^library/ftools',
-    '^library/generator',
-    '^library/getopts',
-    '^library/importenv',
-    '^library/jcode',
-    '^library/mailread',
-    '^library/parsearg',
-    '^library/parsedate',
-    '^library/ping',
-    '^library/readbytes',
-    '^library/rubyunit',
-    '^library/runit',
-    '^library/soap',
-    '^library/wsdl',
-    '^library/xsd',
-    '^library/Win32API',
-
-    '^library/test/unit/collector',
-    '^library/test/unit/ui',
-    '^library/test/unit/util',
-
-    '^library/dl',  # reimplemented and API changed
-  ]
-
-  # An ordered list of the directories containing specs to run
-  set :files, get(:language) + get(:core) + get(:library)
-
-  # This set of files is run by mspec ci
-  set :ci_files, get(:files)
-
-  # The default implementation to run the specs.
-  # TODO: this needs to be more sophisticated since the
-  # executable is not consistently named.
-  set :target, './miniruby'
-
-  set :tags_patterns, [
-                        [%r(language/), 'tags/macruby/language/'],
-                        [%r(core/),     'tags/macruby/core/'],
-                        [%r(library/),  'tags/macruby/library/'],
-                        [/_spec.rb$/,   '_tags.txt']
-                      ]
-end
\ No newline at end of file

Added: MacRuby/branches/experimental/spec/macruby.mspec
===================================================================
--- MacRuby/branches/experimental/spec/macruby.mspec	                        (rev 0)
+++ MacRuby/branches/experimental/spec/macruby.mspec	2009-04-22 22:40:07 UTC (rev 1467)
@@ -0,0 +1,17 @@
+# TODO: This doesn't work correctly yet.
+# load File.expand_path('../frozen/ruby.1.9.mspec', __FILE__)
+load "spec/frozen/ruby.1.9.mspec"
+
+class MSpecScript
+  # The default implementation to run the specs.
+  # TODO: this needs to be more sophisticated since the
+  # executable is not consistently named.
+  set :target, './miniruby'
+
+  set :tags_patterns, [
+                        [%r(language/), 'tags/macruby/language/'],
+                        [%r(core/),     'tags/macruby/core/'],
+                        [%r(library/),  'tags/macruby/library/'],
+                        [/_spec.rb$/,   '_tags.txt']
+                      ]
+end
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090422/25dc079c/attachment.html>