From 2fb900e6a0cc5625b95495eed8890cd58c94e66f Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@ruby-lang.org>
Date: Tue, 20 Sep 2022 21:52:58 +0900
Subject: [PATCH] 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(+)
---
 common.mk | 11 +++++++++--
 version.h |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/common.mk b/common.mk
index 30f7b254b4..4886667645 100644
--- a/common.mk
+++ b/common.mk
@@ -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 \
diff --git a/version.h b/version.h
index c92bc9758b..032ac88273 100644
--- a/version.h
+++ b/version.h
@@ -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