yugui	2008-08-04 20:44:41 +0900 (Mon, 04 Aug 2008)

  New Revision: 18359

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18359

  Log:
    Improved compatibility for mspec.
    * Makefile.in (update-rubyspec): renamed the rubyspec directory
      "spec". Changed directory structure.
    
    * Makefile.in (test-rubyspec): ditto.
    
    * spec/README: described the structure of "spec" directory.
    
    * spec/default.mspec: configured for Matz's Ruby Implementation.

  Added directories:
    trunk/spec/
  Added files:
    trunk/spec/README
    trunk/spec/default.mspec
  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18358)
+++ ChangeLog	(revision 18359)
@@ -1,3 +1,14 @@
+Mon Aug  4 20:39:06 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* Makefile.in (update-rubyspec): renamed the rubyspec directory
+	  "spec". Changed directory structure.
+
+	* Makefile.in (test-rubyspec): ditto.
+
+	* spec/README: described the structure of "spec" directory.
+
+	* spec/default.mspec: configured for Matz's Ruby Implementation.
+
 Mon Aug  4 19:21:43 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* array.c (rb_ary_tmp_new): added.
Index: spec/default.mspec
===================================================================
--- spec/default.mspec	(revision 0)
+++ spec/default.mspec	(revision 18359)
@@ -0,0 +1,13 @@
+class MSpecScript
+  # An ordered list of the directories containing specs to run
+  # as the CI process.
+  set :ci_files, %w[
+    spec/rubyspec/1.9/core
+    spec/rubyspec/1.9/language
+    spec/rubyspec/1.9/library
+  ]
+
+  srcdir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  # The default implementation to run the specs.
+  set :target, File.join(srcdir, `#{srcdir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["RUBY_INSTALL_NAME"]'`)
+end
Index: spec/README
===================================================================
--- spec/README	(revision 0)
+++ spec/README	(revision 18359)
@@ -0,0 +1,24 @@
+= RubySpec
+
+RubySpec (http://rubyspec.org) provides the Ruby langauge specification in an
+executable format. The make task `update-rubyspec' retrieves the specification
+and put it into this directory.
+
+ spec
+  +-- mspec            driver library for executing the specification.
+  +-- rubyspec
+       +-- 1.8
+       |    +-- core
+       |    +-- ...
+       |
+       +-- 1.9
+            +-- core        specification for core libraries 
+            |    +-- array 
+            |    +-- bignum
+            |    +-- ...
+            |
+            +-- fixtures    
+            +-- language    specification for Ruby language itself
+            +-- library     specification for standard libraries.
+                 +-- addrev
+                 +-- ...
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 18358)
+++ Makefile.in	(revision 18359)
@@ -208,18 +208,20 @@
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
 update-rubyspec: 
-	if [ -d $(srcdir)/rubyspec ]; then \
-	  cd $(srcdir)/rubyspec/mspec; \
+	if [ -d $(srcdir)/spec/mspec ]; then \
+	  cd $(srcdir)/spec/mspec; \
 	  git pull; \
-	  cd ../spec/rubyspec; \
+	  cd ../..; \
+	else \
+	  git clone $(MSPEC_GIT_URL) $(srcdir)/spec/mspec; \
+	fi
+	if [ -d $(srcdir)/spec/rubyspec ]; then \
+	  cd $(srcdir)/spec/rubyspec; \
 	  git pull; \
 	else \
-	  mkdir $(srcdir)/rubyspec; \
-	  mkdir $(srcdir)/rubyspec/spec; \
-	  git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec; \
-	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec; \
+	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/spec/rubyspec; \
 	fi
 
 test-rubyspec:
-	@if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
-	$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
+	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec $(srcdir)/spec/rubyspec/$(MAJOR).$(MINOR)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/