postgres.git / summary / log / commit / refs

commit    c697d8a39b9001281aa62249afb01d4ab5e63703
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Fri Oct 15 16:56:29 2021 +0000

    Fix PostgresNode install_path sanity tests that fail on Windows
    
    Backpatch to 14 where install_path was introduced.


 src/test/perl/PostgresNode.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index ed5b4a1c4b5..02a9f49843a 100644
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -1237,9 +1237,10 @@ sub _set_pg_version
 		# complain about that, too.
 		$pg_config = "$inst/bin/pg_config";
 		BAIL_OUT("pg_config not found: $pg_config")
-		  unless -e $pg_config;
+		  unless -e $pg_config
+		  or ($TestLib::windows_os and -e "$pg_config.exe");
 		BAIL_OUT("pg_config not executable: $pg_config")
-		  unless -x $pg_config;
+		  unless $TestLib::windows_os or -x $pg_config;
 
 		# Leave $pg_config install_path qualified, to be sure we get the right
 		# version information, below, or die trying


[parent: 5863115e4cb1]