diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2024-01-30 17:09:44 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2024-01-30 17:09:44 -0500 |
| commit | 6ee26c6a4bafabbd22a85f575d2446fd5ec6ad0d (patch) | |
| tree | 3dff4af7c8025eca797984199eb801b1fe0492ab /src | |
| parent | 8ee9c250875157d42f7ed53508e239d23ce514fb (diff) | |
| download | postgresql-6ee26c6a4bafabbd22a85f575d2446fd5ec6ad0d.tar.gz postgresql-6ee26c6a4bafabbd22a85f575d2446fd5ec6ad0d.zip | |
Fix 003_extrafiles.pl test for the Windows
File::Find converts backslashes to slashes in the newer Perl versions.
See: https://github.com/Perl/perl5/commit/414f14df98cb1c9a20f92c5c54948b67c09f072d
So, do the same conversion for Windows before comparing paths. To
support all Perl versions, always convert them on Windows regardless of
the Perl's version.
Author: Nazir Bilal Yavuz <byavuz81@gmail.com>
Backpatch to all live branches
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_rewind/t/003_extrafiles.pl | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/bin/pg_rewind/t/003_extrafiles.pl b/src/bin/pg_rewind/t/003_extrafiles.pl index d54dcddcbb6..7e4c2771ce7 100644 --- a/src/bin/pg_rewind/t/003_extrafiles.pl +++ b/src/bin/pg_rewind/t/003_extrafiles.pl @@ -78,6 +78,19 @@ sub run_test }, $test_primary_datadir); @paths = sort @paths; + + # File::Find converts backslashes to slashes in the newer Perl + # versions. To support all Perl versions, do the same conversion + # for Windows before comparing the paths. + if ($PostgreSQL::Test::Utils::windows_os) + { + for my $filename (@paths) + { + $filename =~ s{\\}{/}g; + } + $test_primary_datadir =~ s{\\}{/}g; + } + is_deeply( \@paths, [ |