From f54265a8eb872dbccb6e071aa62c840adf39e0a2 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 11 Jul 2016 15:17:58 +0000 Subject: merge revision(s) 49758,50356,50359: [Backport #12563] fake.rb: rubyarchhdrdir for rubyspec * common.mk (test-rubyspec): use fake script to set header directories. * template/fake.rb.in (RUBYOPT): set -r option to propagate to forked processes. * tool/fake.rb (prehook): set rubyarchhdrdir too. * too/fake.rb: don't fake libdir. use libdirname instead. * tool/fake.rb: don't fake libdir. use libdirname instead. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 3aa60c497a..fde7e8c688 100644 --- a/common.mk +++ b/common.mk @@ -584,8 +584,8 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP test-rubyspec-precheck: -test-rubyspec: test-rubyspec-precheck - $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) +test-rubyspec: test-rubyspec-precheck $(arch)-fake.rb + $(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY -- cgit v1.2.3