Skip to content
Snippets Groups Projects
Commit 690ed2b7 authored by Andrew Dunstan's avatar Andrew Dunstan
Browse files

Allow TAP tests to run under Msys

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.
parent 13bba022
Branches
Tags
No related merge requests found
...@@ -92,7 +92,7 @@ unlink "$tempdir/pgdata/$superlongname"; ...@@ -92,7 +92,7 @@ unlink "$tempdir/pgdata/$superlongname";
# The following tests test symlinks. Windows doesn't have symlinks, so # The following tests test symlinks. Windows doesn't have symlinks, so
# skip on Windows. # skip on Windows.
SKIP: { 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 # Create a temporary directory in the system location and symlink it
# to our physical temp location. That way we can use shorter names # to our physical temp location. That way we can use shorter names
......
...@@ -20,7 +20,7 @@ command_ok( ...@@ -20,7 +20,7 @@ command_ok(
"$tempdir/data" ], "$tempdir/data" ],
'configure authentication'); 'configure authentication');
open CONF, ">>$tempdir/data/postgresql.conf"; open CONF, ">>$tempdir/data/postgresql.conf";
if ($Config{osname} ne "MSWin32") if (! $windows_os)
{ {
print CONF "listen_addresses = ''\n"; print CONF "listen_addresses = ''\n";
print CONF "unix_socket_directories = '$tempdir_short'\n"; print CONF "unix_socket_directories = '$tempdir_short'\n";
......
...@@ -30,6 +30,7 @@ our @EXPORT = qw( ...@@ -30,6 +30,7 @@ our @EXPORT = qw(
$tmp_check $tmp_check
$log_path $log_path
$windows_os
); );
use Cwd; use Cwd;
...@@ -42,6 +43,8 @@ use SimpleTee; ...@@ -42,6 +43,8 @@ use SimpleTee;
use Test::More; 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 # Open log file. For each test, the log file name uses the name of the
# file launching this module, without the .pl suffix. # file launching this module, without the .pl suffix.
our ($tmp_check, $log_path); our ($tmp_check, $log_path);
...@@ -140,7 +143,7 @@ sub standard_initdb ...@@ -140,7 +143,7 @@ sub standard_initdb
open CONF, ">>$pgdata/postgresql.conf"; open CONF, ">>$pgdata/postgresql.conf";
print CONF "\n# Added by TestLib.pm)\n"; 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"; print CONF "listen_addresses = '127.0.0.1'\n";
} }
...@@ -151,7 +154,7 @@ sub standard_initdb ...@@ -151,7 +154,7 @@ sub standard_initdb
} }
close CONF; 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 # Set up the cluster to allow replication connections, in the same way that
...@@ -162,7 +165,7 @@ sub configure_hba_for_replication ...@@ -162,7 +165,7 @@ sub configure_hba_for_replication
open HBA, ">>$pgdata/pg_hba.conf"; open HBA, ">>$pgdata/pg_hba.conf";
print HBA "\n# Allow replication (set up by TestLib.pm)\n"; 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"; print HBA "local replication all trust\n";
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment