aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-25 17:24:06 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-25 17:24:06 +0000
commitde1a9d65653d9053fdc7dc2b8e7068446dddfdf3 (patch)
treef29c902c00b347befc6e56343e36f5982f50e6bc
parentfc8a2c2f46476d0fa725e552932d8cfd2fcf5d6a (diff)
downloadruby-de1a9d65653d9053fdc7dc2b8e7068446dddfdf3.tar.gz
revert r58478 and r58479 because they do not support not in-place build
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--common.mk2
-rw-r--r--spec/default.mspec2
2 files changed, 2 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 303edb4971..873b6fb851 100644
--- a/common.mk
+++ b/common.mk
@@ -712,7 +712,7 @@ test-rubyspec-precheck: $(arch)-fake.rb
test-rubyspec: $(TEST_RUNNABLE)-test-rubyspec
yes-test-rubyspec: test-rubyspec-precheck
$(gnumake_recursive)$(Q) \
- $(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run $(MSPECOPT)
+ $(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
no-test-rubyspec: test-rubyspec-precheck
RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
diff --git a/spec/default.mspec b/spec/default.mspec
index 1c7fc7f630..c67aafe588 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -1,5 +1,5 @@
# -*- ruby -*-
-require_relative "../rbconfig"
+load "./rbconfig.rb"
load File.dirname(__FILE__) + '/rubyspec/default.mspec'
OBJDIR = File.expand_path("spec/rubyspec/optional/capi/ext")
class MSpecScript