1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@21212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-12-31 10:38:39 +00:00
parent f7676fd9d4
commit 2be0eea2e8
4 changed files with 25 additions and 21 deletions

View file

@ -1,3 +1,11 @@
Wed Dec 31 19:35:57 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* 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 17:16:46 2008 Tanaka Akira <akr@fsij.org> Wed Dec 31 17:16:46 2008 Tanaka Akira <akr@fsij.org>
* ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): show openssl error * ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): show openssl error

View file

@ -241,20 +241,24 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
update-rubyspec: update-rubyspec:
if [ -d $(srcdir)/spec/mspec ]; then \ @if [ -d $(srcdir)/spec/mspec ]; then \
cd $(srcdir)/spec/mspec; \ cd $(srcdir)/spec/mspec; \
echo updating mspec ...; \
git pull; \ git pull; \
cd ../..; \ cd ../..; \
else \ else \
echo retrieving mspec ...; \
git clone $(MSPEC_GIT_URL) $(srcdir)/spec/mspec; \ git clone $(MSPEC_GIT_URL) $(srcdir)/spec/mspec; \
fi fi
if [ -d $(srcdir)/spec/rubyspec ]; then \ @if [ -d $(srcdir)/spec/rubyspec ]; then \
cd $(srcdir)/spec/rubyspec; \ cd $(srcdir)/spec/rubyspec; \
echo updating rubyspec ...; \
git pull; \ git pull; \
else \ else \
echo retrieving rubyspec ...; \
git clone $(RUBYSPEC_GIT_URL) $(srcdir)/spec/rubyspec; \ git clone $(RUBYSPEC_GIT_URL) $(srcdir)/spec/rubyspec; \
fi fi
test-rubyspec: test-rubyspec:
@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi @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)

View file

@ -8,26 +8,15 @@ and put it into this directory.
spec spec
+-- mspec driver library for executing the specification. +-- mspec driver library for executing the specification.
+-- rubyspec +-- rubyspec
+-- 1.8 specification for both Ruby 1.8 and 1.9 +-- core specification for core libraries
| +-- core specification for core libraries | +-- array
| | +-- array | +-- bignum
| | +-- bignum
| | +-- ...
| |
| +-- fixtures example classes for writing specs
| +-- language specification for Ruby language itself
| +-- library specification for standard libraries
| +-- addrev
| +-- ...
| +-- core
| +-- ... | +-- ...
| |
+-- 1.9 specification for new features and large changes in Ruby 1.9 +-- fixtures example classes for writing specs
+-- core +-- language specification for Ruby language itself
+-- fixtures +-- library specification for standard libraries
+-- language +-- addrev
+-- library
+-- core
+-- ... +-- ...
== How to run == How to run
@ -36,4 +25,6 @@ and put it into this directory.
$ make test-rubyspec $ make test-rubyspec
:mspec command :mspec command
verifies the specified spec. verifies the specified spec.
$ mspec {language|core|language}
or
$ mspec spec/path/to/some_spec.rb $ mspec spec/path/to/some_spec.rb

View file

@ -8,6 +8,7 @@ class MSpecScript
# The default implementation to run the specs. # The default implementation to run the specs.
set :target, File.join(builddir, "miniruby#{config['exeext']}") set :target, File.join(builddir, "miniruby#{config['exeext']}")
set :prefix, 'spec/rubyspec'
set :flags, %W[ set :flags, %W[
-I#{srcdir}/lib -I#{srcdir}/lib
-I#{srcdir}/#{config['EXTOUT']}/common -I#{srcdir}/#{config['EXTOUT']}/common