From c852a64cc7308d0b060083ad8dfc218b33f7996e Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 26 May 2009 12:27:14 +0000 Subject: 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 --- Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile.in') 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 -- cgit v1.2.3