yugui	2009-01-01 15:42:51 +0900 (Thu, 01 Jan 2009)

  New Revision: 21231

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

  Log:
    merges r21212 from trunk into ruby_1_9_1.
    * spec/README: follows the change of directory structure in rubyspec.
    * spec/default.mspec: ditto. Also follows change of mspec command.
    
    * Makefile.in: ditto.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/spec/README
    branches/ruby_1_9_1/spec/default.mspec

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21230)
+++ ruby_1_9_1/ChangeLog	(revision 21231)
@@ -1,3 +1,11 @@
+Wed Dec 31 19:35:57 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* spec/README: follows the change of directory structure in rubyspec.
+
+	* spec/default.mspec: ditto. Also follows change of mspec command.
+
+	* Makefile.in: ditto.
+
 Wed Dec 31 15:45:18 2008  Tanaka Akira  <akr@f...>
 
 	* io.c (copy_stream_body): don't check to_io because
Index: ruby_1_9_1/spec/default.mspec
===================================================================
--- ruby_1_9_1/spec/default.mspec	(revision 21230)
+++ ruby_1_9_1/spec/default.mspec	(revision 21231)
@@ -8,6 +8,7 @@
 
   # The default implementation to run the specs.
   set :target, File.join(builddir, "miniruby#{config['exeext']}")
+  set :prefix, 'spec/rubyspec'
   set :flags, %W[
     -I#{srcdir}/lib
     -I#{srcdir}/#{config['EXTOUT']}/common
Index: ruby_1_9_1/spec/README
===================================================================
--- ruby_1_9_1/spec/README	(revision 21230)
+++ ruby_1_9_1/spec/README	(revision 21231)
@@ -8,26 +8,15 @@
  spec
   +-- mspec            driver library for executing the specification.
   +-- rubyspec
-       +-- 1.8           specification for both Ruby 1.8 and 1.9
-       |    +-- core        specification for core libraries 
-       |    |    +-- array 
-       |    |    +-- bignum
-       |    |    +-- ...
-       |    |
-       |    +-- fixtures    example classes for writing specs
-       |    +-- language    specification for Ruby language itself
-       |    +-- library     specification for standard libraries
-       |         +-- addrev
-       |         +-- ...
-       |    +-- core
+       +-- core        specification for core libraries 
+       |    +-- array 
+       |    +-- bignum
        |    +-- ...
        |
-       +-- 1.9           specification for new features and large changes in Ruby 1.9
-            +-- core
-            +-- fixtures
-            +-- language
-            +-- library
-            +-- core
+       +-- fixtures    example classes for writing specs
+       +-- language    specification for Ruby language itself
+       +-- library     specification for standard libraries
+            +-- addrev
             +-- ...
 
 == How to run
@@ -36,4 +25,6 @@
    $ make test-rubyspec
 :mspec command
   verifies the specified spec.
+   $ mspec {language|core|language}
+   or
    $ mspec spec/path/to/some_spec.rb
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 21230)
+++ ruby_1_9_1/Makefile.in	(revision 21231)
@@ -236,20 +236,24 @@
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
 update-rubyspec: 
-	if [ -d $(srcdir)/spec/mspec ]; then \
+	@if [ -d $(srcdir)/spec/mspec ]; then \
 	  cd $(srcdir)/spec/mspec; \
+	  echo updating mspec ...; \
 	  git pull; \
 	  cd ../..; \
 	else \
+	  echo retrieving mspec ...; \
 	  git clone $(MSPEC_GIT_URL) $(srcdir)/spec/mspec; \
 	fi
-	if [ -d $(srcdir)/spec/rubyspec ]; then \
+	@if [ -d $(srcdir)/spec/rubyspec ]; then \
 	  cd $(srcdir)/spec/rubyspec; \
+	  echo updating rubyspec ...; \
 	  git pull; \
 	else \
+	  echo retrieving rubyspec ...; \
 	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/spec/rubyspec; \
 	fi
 
 test-rubyspec:
 	@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)
+	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec $(MSPECOPT)

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