Allow TAP tests to run under Msys

adunstan · adunstan · commit 690ed2b76ab9 · 2015-08-02T20:58:18.000-04:00
The Msys DTK perl, which is required to run TAP tests under Msys as a
native perl won't recognize the correct virtual paths, has its osname
recorded in the Config module as 'msys' instead of 'MSWin32'. To avoid
having to repeat the test a variable is created that is true iff the
osname is either of these values, and is then used everywhere that
matters.
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
@@ -92,7 +92,7 @@
 # The following tests test symlinks. Windows doesn't have symlinks, so
 # skip on Windows.
 SKIP: {
-    skip "symlinks not supported on Windows", 10 if ($Config{osname} eq "MSWin32");
+    skip "symlinks not supported on Windows", 10 if ($windows_os);
 
 	# Create a temporary directory in the system location and symlink it
 	# to our physical temp location.  That way we can use shorter names
diff --git a/src/bin/pg_ctl/t/001_start_stop.pl b/src/bin/pg_ctl/t/001_start_stop.pl
@@ -20,7 +20,7 @@
 		"$tempdir/data" ],
 	'configure authentication');
 open CONF, ">>$tempdir/data/postgresql.conf";
-if ($Config{osname} ne "MSWin32")
+if (! $windows_os)
 {
 	print CONF "listen_addresses = ''\n";
 	print CONF "unix_socket_directories = '$tempdir_short'\n";
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
@@ -30,6 +30,7 @@ our @EXPORT = qw(
 
   $tmp_check
   $log_path
+  $windows_os
 );
 
 use Cwd;
@@ -42,6 +43,8 @@ use SimpleTee;
 
 use Test::More;
 
+our $windows_os = $Config{osname} eq 'MSWin32' || $Config{osname} eq 'msys';
+
 # Open log file. For each test, the log file name uses the name of the
 # file launching this module, without the .pl suffix.
 our ($tmp_check, $log_path);
@@ -140,7 +143,7 @@ sub standard_initdb
 
 	open CONF, ">>$pgdata/postgresql.conf";
 	print CONF "\n# Added by TestLib.pm)\n";
-	if ($Config{osname} eq "MSWin32")
+	if ($windows_os)
 	{
 		print CONF "listen_addresses = '127.0.0.1'\n";
 	}
@@ -151,7 +154,7 @@ sub standard_initdb
 	}
 	close CONF;
 
-	$ENV{PGHOST}         = ($Config{osname} eq "MSWin32") ? "127.0.0.1" : $tempdir_short;
+	$ENV{PGHOST}         = $windows_os ? "127.0.0.1" : $tempdir_short;
 }
 
 # Set up the cluster to allow replication connections, in the same way that
@@ -162,7 +165,7 @@ sub configure_hba_for_replication
 
 	open HBA, ">>$pgdata/pg_hba.conf";
 	print HBA "\n# Allow replication (set up by TestLib.pm)\n";
-	if ($Config{osname} ne "MSWin32")
+	if (! $windows_os)
 	{
 		print HBA "local replication all trust\n";
 	}

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`"$tempdir/data" ],`
`21`	`21`	`'configure authentication');`
`22`	`22`	`open CONF, ">>$tempdir/data/postgresql.conf";`
`23`		`-if ($Config{osname} ne "MSWin32")`
	`23`	`+if (! $windows_os)`
`24`	`24`	`{`
`25`	`25`	`print CONF "listen_addresses = ''\n";`
`26`	`26`	`print CONF "unix_socket_directories = '$tempdir_short'\n";`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ our @EXPORT = qw(`
`30`	`30`
`31`	`31`	`$tmp_check`
`32`	`32`	`$log_path`
	`33`	`+ $windows_os`
`33`	`34`	`);`
`34`	`35`
`35`	`36`	`use Cwd;`
`@@ -42,6 +43,8 @@ use SimpleTee;`
`42`	`43`
`43`	`44`	`use Test::More;`
`44`	`45`
	`46`	`+our $windows_os = $Config{osname} eq 'MSWin32' \|\| $Config{osname} eq 'msys';`
	`47`	`+`
`45`	`48`	`# Open log file. For each test, the log file name uses the name of the`
`46`	`49`	`# file launching this module, without the .pl suffix.`
`47`	`50`	`our ($tmp_check, $log_path);`
`@@ -140,7 +143,7 @@ sub standard_initdb`
`140`	`143`
`141`	`144`	`open CONF, ">>$pgdata/postgresql.conf";`
`142`	`145`	`print CONF "\n# Added by TestLib.pm)\n";`
`143`		`- if ($Config{osname} eq "MSWin32")`
	`146`	`+ if ($windows_os)`
`144`	`147`	`{`
`145`	`148`	`print CONF "listen_addresses = '127.0.0.1'\n";`
`146`	`149`	`}`
`@@ -151,7 +154,7 @@ sub standard_initdb`
`151`	`154`	`}`
`152`	`155`	`close CONF;`
`153`	`156`
`154`		`- $ENV{PGHOST} = ($Config{osname} eq "MSWin32") ? "127.0.0.1" : $tempdir_short;`
	`157`	`+ $ENV{PGHOST} = $windows_os ? "127.0.0.1" : $tempdir_short;`
`155`	`158`	`}`
`156`	`159`
`157`	`160`	`# Set up the cluster to allow replication connections, in the same way that`
`@@ -162,7 +165,7 @@ sub configure_hba_for_replication`
`162`	`165`
`163`	`166`	`open HBA, ">>$pgdata/pg_hba.conf";`
`164`	`167`	`print HBA "\n# Allow replication (set up by TestLib.pm)\n";`
`165`		`- if ($Config{osname} ne "MSWin32")`
	`168`	`+ if (! $windows_os)`
`166`	`169`	`{`
`167`	`170`	`print HBA "local replication all trust\n";`
`168`	`171`	`}`