diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-26 12:27:14 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-26 12:27:14 +0000 |
| commit | c852a64cc7308d0b060083ad8dfc218b33f7996e (patch) | |
| tree | 630e01fd9166de0eebe9c2275893ac2b8ab3a956 /Makefile.in | |
| parent | 006cdad18fabdb9045d3f5baa36ca21f23668571 (diff) | |
merge revision(s) 22489:
* 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_7@23589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index a37bcf65fb..9eaab0be4d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -189,14 +189,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; \ 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 |