diff options
| author | Andrew Dunstan | 2015-08-03 00:58:18 +0000 |
|---|---|---|
| committer | Andrew Dunstan | 2015-08-03 00:58:18 +0000 |
| commit | 690ed2b76ab91eb79ea04ee2bfbdc8a2693f2a37 (patch) | |
| tree | 5dce2e0ab1ee2fe542e87df6187182ca8480eeaf /src/bin | |
| parent | 13bba02271dce865cd20b6f49224889c73fed4e7 (diff) | |
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.
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/pg_basebackup/t/010_pg_basebackup.pl | 2 | ||||
| -rw-r--r-- | src/bin/pg_ctl/t/001_start_stop.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index 4dbf8ca5224..5fa0caa3053 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -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 diff --git a/src/bin/pg_ctl/t/001_start_stop.pl b/src/bin/pg_ctl/t/001_start_stop.pl index 015e4d8931c..dae47a80135 100644 --- a/src/bin/pg_ctl/t/001_start_stop.pl +++ b/src/bin/pg_ctl/t/001_start_stop.pl @@ -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"; |