From b0a4c3e88b8b527679216dca5e2e9cbd49514e99 Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Tue, 8 Apr 2025 10:57:31 -0500 Subject: [PATCH] Prevent 006_transfer_modes.pl from leaving files behind. This test was leaving files like delete_old_cluster.{sh,bat} 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) Reviewed-by: Michael Paquier Reviewed-by: Andrew Dunstan Reviewed-by: Tom Lane Discussion: https://postgr.es/m/Z_RHkG770w3SE0yU%40nathan --- 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..550a63fdf7d 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(); } +# Run pg_upgrade in tmp_check to avoid leaving files like +# delete_old_cluster.{sh,bat} in the source directory for VPATH and meson +# builds. +chdir ${PostgreSQL::Test::Utils::tmp_check}; + test_mode('--clone'); test_mode('--copy'); test_mode('--copy-file-range'); -- 2.30.2