postgres.git / summary / log / commit / refs

commit    a09aa18eaa6aafd33bae7c32d99eb9e86a6ca3d6
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Fri Dec 08 01:37:34 2023 +0000
First released in: 17.0, 15.6, 16.2

    Fix path of regress shared library in pg_upgrade test
    
    During a pg_upgrade test using an old dump, all references to the old
    regress shared library path (so, dylib or dll) are updated to point to
    the library path used by the new build, to ensure a consistent
    comparison between the old and new dumps.
    
    The test previously relied on a hardcoded value of "src/test/regress/"
    to build the new path value, which would point to an incorrect location
    for the meson and vpath builds.  This is replaced by REGRESS_SHLIB, able
    to point to the correct location of the regress shared library.
    
    Author: Alexander Lakhin
    Discussion: https://postgr.es/m/a628d8ad-a08a-2eab-4ca9-641bc82d3193@gmail.com
    Backpatch-through: 15


 src/bin/pg_upgrade/t/002_pg_upgrade.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/pg_upgrade/t/002_pg_upgrade.pl b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
index 997963082bd..e5f57e550af 100644
--- a/src/bin/pg_upgrade/t/002_pg_upgrade.pl
+++ b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
@@ -284,7 +284,7 @@ if (defined($ENV{oldinstall}))
 
 	my $dump_data = slurp_file($dump1_file);
 
-	my $newregresssrc = "$srcdir/src/test/regress";
+	my $newregresssrc = dirname($ENV{REGRESS_SHLIB});
 	foreach (@libpaths)
 	{
 		my $libpath = $_;


[parent: 6248a2bb92cc]