1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 035978d7be9bc3819f42f964fe6193d983cce63f,2e324b645e16e67c14de80ea34b1d61165045f22,b6a9e683917745df2822a611fce64df9ae8090a7:

Pass job-server FDs to bundler tests

	---
	 common.mk | 4 ++--
	 1 file changed, 2 insertions(+), 2 deletions(-)

	Manage paths for bundler tests

	---
	 common.mk | 6 +++++-
	 1 file changed, 5 insertions(+), 1 deletion(-)

	Add noarch-fake.rb target

	`yes-fake` depends on it when `arch=noarch` is given, but the rule to
	generate it from fake.rb.in is ignored now.
	---
	 common.mk | 3 +++
	 1 file changed, 3 insertions(+)
This commit is contained in:
nagachika 2022-09-20 21:52:58 +09:00
parent 967f1251b4
commit 2fb900e6a0
2 changed files with 10 additions and 3 deletions

View file

@ -761,6 +761,9 @@ $(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_erb.rb version
$(BOOTSTRAPRUBY) "$(tooldir)/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \
i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)"
noarch-fake.rb: # prerequisite of yes-fake
touch $@
btest: $(TEST_RUNNABLE)-btest
no-btest: PHONY
yes-btest: fake miniruby$(EXEEXT) PHONY
@ -1419,14 +1422,18 @@ RSPECOPTS =
BUNDLER_SPECS =
test-bundler: $(TEST_RUNNABLE)-test-bundler
yes-test-bundler: yes-test-bundler-prepare
$(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:
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
$(XRUBY) \
$(gnumake_recursive)$(XRUBY) \
-r./$(arch)-fake \
-e "ARGV[-1] = File.expand_path(ARGV[-1])" \
-e "exec(*ARGV)" -- \
$(XRUBY) -I$(srcdir)/spec/bundler \

View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 55
#define RUBY_PATCHLEVEL 56
#define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 9