diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-31 10:38:39 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-31 10:38:39 +0000 |
| commit | 2be0eea2e876665e57afd5d4bc70fbafe0767c57 (patch) | |
| tree | ff0706fbae73fbf16ede8f9e77dbbe8205672bfd | |
| parent | f7676fd9d4bfa23e1dabf11c26f7ca47eeb4d425 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | spec/README | 27 | ||||
| -rw-r--r-- | spec/default.mspec | 1 |
4 files changed, 25 insertions, 21 deletions
@@ -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> * ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): show openssl error diff --git a/Makefile.in b/Makefile.in index b7313dd85f..6f50565562 100644 --- a/Makefile.in +++ b/Makefile.in @@ -241,20 +241,24 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) $(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) diff --git a/spec/README b/spec/README index ea10bcf030..3ba87445e9 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 402065b44e..b94807d6d5 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 |