diff options
| author | Noah Misch <noah@leadboat.com> | 2019-04-14 00:42:34 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2019-04-14 00:42:43 -0700 |
| commit | 31e2caaceea99f1a638f3f4a32e99e7fe5bdad90 (patch) | |
| tree | 58afefe49c1e35b313c53b5edd4941f9e761b56e | |
| parent | de262941fc9c5492b1a66444cfe87805a1bd6de5 (diff) | |
| download | postgresql-31e2caaceea99f1a638f3f4a32e99e7fe5bdad90.tar.gz postgresql-31e2caaceea99f1a638f3f4a32e99e7fe5bdad90.zip | |
MSYS: Translate REGRESS_SHLIB to a Windows file name.
Per buildfarm member jacana. Back-patch to v11; earlier branches skip
the affected test under msys.
Discussion: https://postgr.es/m/GrdLgAdUK9FdyZg8VIcTDKVOkys122ZINEb3CjjoySfGj2KyPiMKTh1zqtRp0TAD7FJ27G-OBB3eplxIB5GhcQH5o8zzGZfp0MuJaXJxVxk=@yesql.se
| -rw-r--r-- | src/test/recovery/t/017_shm.pl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/test/recovery/t/017_shm.pl b/src/test/recovery/t/017_shm.pl index 3cbe938ddd1..f89d53a8793 100644 --- a/src/test/recovery/t/017_shm.pl +++ b/src/test/recovery/t/017_shm.pl @@ -3,6 +3,7 @@ # use strict; use warnings; +use Config; use IPC::Run 'run'; use PostgresNode; use Test::More; @@ -11,6 +12,14 @@ use Time::HiRes qw(usleep); plan tests => 5; +# See PostgresNode +my $vfs_path = ''; +if ($Config{osname} eq 'msys') +{ + $vfs_path = `cd / && pwd -W`; + chomp $vfs_path; +} + my $tempdir = TestLib::tempdir; my $port; @@ -97,7 +106,7 @@ log_ipcs(); $gnat->safe_psql('postgres', <<EOSQL); CREATE FUNCTION wait_pid(int) RETURNS void - AS '$ENV{REGRESS_SHLIB}' + AS '$vfs_path$ENV{REGRESS_SHLIB}' LANGUAGE C STRICT; EOSQL my $slow_query = 'SELECT wait_pid(pg_backend_pid())'; |