diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 16:54:54 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 16:54:54 +0000 |
| commit | ac896ee3d51342b9aafe427f579712cd5952d7d3 (patch) | |
| tree | af866879d3f1abc07223e9fbd690fb0bbd233b12 | |
| parent | 636b14b70c4cc7eaaee4f8311681466b0e8a8823 (diff) | |
* Makefile.in (update-rubyspec, test-rubyspec): Catch up to
rubyspec merge. A patch by Brian Ford at [ruby-core:21032]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sun Feb 22 01:22:31 2009 URABE Shyouhei <shyouhei@ruby-lang.org> + + * Makefile.in (update-rubyspec, test-rubyspec): Catch up to + rubyspec merge. A patch by Brian Ford at [ruby-core:21032] + Thu Feb 19 14:22:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (create_makefile): added phony targets. diff --git a/Makefile.in b/Makefile.in index 33de83deb7..4630d8e63a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -200,15 +200,14 @@ update-rubyspec: if [ -d $(srcdir)/rubyspec ]; then \ cd $(srcdir)/rubyspec/mspec; \ git pull; \ - cd ../spec/rubyspec; \ + cd ../spec; \ 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)/rubyspec/spec; \ 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 -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR) + RUBY_EXE="$(RUNRUBY)" $(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec-run --background --prefix $(srcdir)/rubyspec/spec -B $(srcdir)/rubyspec/spec/ruby.$(MAJOR).$(MINOR).mspec |