From f3a6ad287c6f8d7beb4a5a2c54a740c240f2421e Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 31 Oct 2008 03:31:09 +0000 Subject: * spec/default.mspec: supports that the build directory != srcdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/default.mspec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'spec') diff --git a/spec/default.mspec b/spec/default.mspec index e4b9dae523..a018b4020c 100644 --- a/spec/default.mspec +++ b/spec/default.mspec @@ -7,11 +7,14 @@ class MSpecScript spec/rubyspec/1.9/library ] - srcdir = File.expand_path(File.join(File.dirname(__FILE__), '..')) - config = proc{|name| `#{srcdir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["#{name}"]'`} + builddir = File.expand_path(File.join(File.dirname(__FILE__), '..')) + srcdir = ENV['SRCDIR'] + srcdir ||= $1 if File.read("#{builddir}/Makefile")[/^\s*srcdir\s*=\s*(.+)/i] + srcdir ||= builddir + config = proc{|name| `#{builddir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["#{name}"]'`} # The default implementation to run the specs. - set :target, File.join(srcdir, "miniruby#{config['exeext']}") + set :target, File.join(builddir, "miniruby#{config['exeext']}") set :flags, %W[ -I#{srcdir}/lib -I#{srcdir}/#{config['EXTOUT']}/common -- cgit v1.2.3