Skip to content

Commit 49d2d3a

Browse files
committed
Fix up rubyGH-13520
The `-C` option takes precedence over the `-r` option. This means that the options `-r./$(arch)-fake -C $(srcdir)` try to load the file in the source directory rather than the build directory. [ci skip] because all CIs use `test-bundler-parallel` instead of this.
1 parent d9674b1 commit 49d2d3a

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

common.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1644,7 +1644,8 @@ test-bundler: $(TEST_RUNNABLE)-test-bundler
16441644
yes-test-bundler: $(PREPARE_BUNDLER)
16451645
$(gnumake_recursive)$(XRUBY) \
16461646
-r./$(arch)-fake \
1647-
-C $(srcdir) -Ispec/bundler -Ispec/lib spec/bin/rspec \
1647+
-I$(srcdir)/spec/bundler -I$(srcdir)/spec/lib \
1648+
-e 'Dir.chdir(ARGV.shift); load("spec/bin/rspec")' $(srcdir) \
16481649
-r spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
16491650
no-test-bundler:
16501651

0 commit comments

Comments
 (0)