diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-31 03:31:09 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-31 03:31:09 +0000 |
| commit | f3a6ad287c6f8d7beb4a5a2c54a740c240f2421e (patch) | |
| tree | e1cdaaf2d6fbbef7b22ad3642d8c8090e2c871c3 | |
| parent | 9afa4ed9e8eeda4108c759e423ef08218768d028 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | spec/default.mspec | 9 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Fri Oct 31 12:27:52 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * spec/default.mspec: supports that the build directory != srcdir. + Thu Oct 30 23:32:17 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> * test/test_delegate.rb (test_syscallerror_eq): ignored because the 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 |