From a349a98b19708984dc677e5809038d343d67bf17 Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Mon, 7 Apr 2025 16:23:44 -0500 Subject: [PATCH v1 1/1] Fix the 006_transfer_modes.pl test. This test was leaving files like delete_old_cluster.sh in the source directory for VPATH and meson builds. To fix, change the directory to tmp_check before running the test, as was done in commits 15b6d21553, 8af917be6b, and c462b054ba. Oversight in commit af0d4901c1. Reported-by: Andrew Dunstan (on Discord) Discussion: ??? --- src/bin/pg_upgrade/t/006_transfer_modes.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/bin/pg_upgrade/t/006_transfer_modes.pl b/src/bin/pg_upgrade/t/006_transfer_modes.pl index 34fddbcdab5..ed713a7d44d 100644 --- a/src/bin/pg_upgrade/t/006_transfer_modes.pl +++ b/src/bin/pg_upgrade/t/006_transfer_modes.pl @@ -102,6 +102,11 @@ sub test_mode $new->clean_node(); } +# In a VPATH build, we'll be started in the source directory, but we want +# to run pg_upgrade in the build directory so that any files generated finish +# in it, like delete_old_cluster.{sh,bat}. +chdir ${PostgreSQL::Test::Utils::tmp_check}; + test_mode('--clone'); test_mode('--copy'); test_mode('--copy-file-range'); -- 2.39.5 (Apple Git-154)