From 2a191a1470a1c8cbff3625484d4af515e8d6f0bc Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 1 Jan 2009 06:42:51 +0000
Subject: 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.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 spec/README        | 27 +++++++++------------------
 spec/default.mspec |  1 +
 2 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'spec')

diff --git a/spec/README b/spec/README
index ea10bcf03..3ba87445e 100644
--- a/spec/README
+++ b/spec/README
@@ -8,26 +8,15 @@ and put it into this directory.
  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 @@ and put it into this directory.
    $ make test-rubyspec
 :mspec command
   verifies the specified spec.
+   $ mspec {language|core|language}
+   or
    $ mspec spec/path/to/some_spec.rb
diff --git a/spec/default.mspec b/spec/default.mspec
index 402065b44..b94807d6d 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -8,6 +8,7 @@ class MSpecScript
 
   # 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
-- 
cgit