diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | spec/default.mspec | 11 |
3 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Thu Jan 1 22:27:55 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * spec/default.mspec: fix for builddir != srcdir + + * Makefile.in: ditto. + Thu Jan 1 15:08:46 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> * tool/flie2lastrev.rb: supports git repositories which are cloned diff --git a/Makefile.in b/Makefile.in index ef5e61eb4b..9937b7b987 100644 --- a/Makefile.in +++ b/Makefile.in @@ -263,4 +263,4 @@ update-rubyspec: 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 $(MSPECOPT) + $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec -B $(srcdir)/spec/default.mspec $(MSPECOPT) diff --git a/spec/default.mspec b/spec/default.mspec index b94807d6d5..50cc6b0920 100644 --- a/spec/default.mspec +++ b/spec/default.mspec @@ -1,14 +1,17 @@ load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec' class MSpecScript - builddir = File.expand_path(File.join(File.dirname(__FILE__), '..')) + builddir = Dir.pwd srcdir = ENV['SRCDIR'] - srcdir ||= $1 if File.read("#{builddir}/Makefile")[/^\s*srcdir\s*=\s*(.+)/i] - srcdir ||= builddir + if !srcdir and File.exist?("#{builddir}/Makefile") then + File.open("#{builddir}/Makefile", "r:US-ASCII") {|f| + f.read[/^\s*srcdir\s*=\s*(.+)/i] and srcdir = $1 + } + end config = proc{|name| `#{builddir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["#{name}"]'`} # The default implementation to run the specs. set :target, File.join(builddir, "miniruby#{config['exeext']}") - set :prefix, 'spec/rubyspec' + set :prefix, File.expand_path('rubyspec', File.dirname(__FILE__)) set :flags, %W[ -I#{srcdir}/lib -I#{srcdir}/#{config['EXTOUT']}/common |