summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2022-09-14 00:58:43 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2022-09-14 11:27:05 +0900
commit2e324b645e16e67c14de80ea34b1d61165045f22 (patch)
treec891d926fb864794a14e892486e9f4da6a12f51d
parent035978d7be9bc3819f42f964fe6193d983cce63f (diff)
Manage paths for bundler tests
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/6370
-rw-r--r--common.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 64d771fa1c..9d7b30b32b 100644
--- a/common.mk
+++ b/common.mk
@@ -1475,7 +1475,10 @@ RSPECOPTS =
BUNDLER_SPECS =
test-bundler: $(TEST_RUNNABLE)-test-bundler
yes-test-bundler: yes-test-bundler-prepare
- $(gnumake_recursive)$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
+ $(gnumake_recursive)$(XRUBY) \
+ -r./$(arch)-fake \
+ -e "exec(*ARGV)" -- \
+ $(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
--require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
no-test-bundler:
@@ -1483,6 +1486,7 @@ PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log
test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel
yes-test-bundler-parallel: yes-test-bundler-prepare
$(gnumake_recursive)$(XRUBY) \
+ -r./$(arch)-fake \
-e "ARGV[-1] = File.expand_path(ARGV[-1])" \
-e "exec(*ARGV)" -- \
$(XRUBY) -I$(srcdir)/spec/bundler \