mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-01 19:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow TAP tests to run under Msys

Browse Source 
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.
This commit is contained in:
Andrew Dunstan 2015-08-02 20:58:18 -04:00
parent 13bba02271
commit 690ed2b76a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_basebackup/t/010_pg_basebackup.pl
View File

@ -92,7 +92,7 @@ unlink "$tempdir/pgdata/$superlongname";
# 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

2
src/bin/pg_ctl/t/001_start_stop.pl
View File

@ -20,7 +20,7 @@ command_ok(
"$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";

9
src/test/perl/TestLib.pm
View File

@ -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";
}