MIME-Version: 1.0
From: Nazir Bilal Yavuz <byavuz81@gmail.com>
Date: Tue, 30 Jan 2024 14:21:57 +0300
Message-ID: 
 <CAN55FZ2XW1B5NP11Vy-y9O2BmMnLFq8grCsHZr_AovcL4QCgdg@mail.gmail.com>
Subject: 003_extrafiles.pl test fails on Windows with the newer Perl versions
To: PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>
Content-Type: multipart/mixed; boundary="0000000000001e19c3061027f90f"
Archived-At: 
 <https://www.postgresql.org/message-id/CAN55FZ2XW1B5NP11Vy-y9O2BmMnLFq8grCsHZr_AovcL4QCgdg%40mail.gmail.com>
Precedence: bulk

--0000000000001e19c3061027f90f
Content-Type: text/plain; charset="UTF-8"

Hi,

I was trying to install newer Perl versions to Windows CI images and
found that 003_extrafiles.pl test fails on Windows with:

(0.183s) not ok 2 - file lists match
(0.000s) #   Failed test 'file lists match'
#   at C:/cirrus/src/bin/pg_rewind/t/003_extrafiles.pl line 81.
(0.000s) #     Structures begin differing at:
#          $got->[0] =
'C:/cirrus/build/testrun/pg_rewind/003_extrafiles/data/t_003_extrafiles_primary_local_data/pgdata/tst_both_dir'
#     $expected->[0] =
'C:\cirrus\build/testrun/pg_rewind/003_extrafiles\data/t_003_extrafiles_primary_local_data/pgdata/tst_both_dir'

(0.263s) not ok 5 - file lists match
(0.000s) #   Failed test 'file lists match'
#   at C:/cirrus/src/bin/pg_rewind/t/003_extrafiles.pl line 81.
(0.000s) #     Structures begin differing at:
#          $got->[0] =
'C:/cirrus/build/testrun/pg_rewind/003_extrafiles/data/t_003_extrafiles_primary_remote_data/pgdata/tst_both_dir'
#     $expected->[0] =
'C:\cirrus\build/testrun/pg_rewind/003_extrafiles\data/t_003_extrafiles_primary_remote_data/pgdata/tst_both_dir'

It looks like File::Find converts backslashes to slashes in the newer
Perl versions. I tried to find the related commit and found this:
https://github.com/Perl/perl5/commit/414f14df98cb1c9a20f92c5c54948b67c09f072d

To solve this, I did the same conversion for Windows before comparing
the paths. And to support all Perl versions, I decided to always
convert them on Windows regardless of the Perl's version. The fix is
attached.

I looked at other File::Find appearances in the code but they do not
compare the paths. So, I do not think there is any need to fix them.

Any kind of feedback would be appreciated.

--
Regards,
Nazir Bilal Yavuz
Microsoft

--0000000000001e19c3061027f90f
Content-Type: application/x-patch;
	name="v1-0001-Fix-003_extrafiles.pl-test-for-the-Windows.patch"
Content-Disposition: attachment;
	filename="v1-0001-Fix-003_extrafiles.pl-test-for-the-Windows.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_ls09h1k20>
X-Attachment-Id: f_ls09h1k20

RnJvbSBiMjhmNDhmZTdkOThkM2RkN2QyZmNmNjUyYmZhNWM4YTRjZDFjMmQ2IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOYXppciBCaWxhbCBZYXZ1eiA8YnlhdnV6ODFAZ21haWwuY29t
PgpEYXRlOiBUdWUsIDMwIEphbiAyMDI0IDEzOjEyOjQxICswMzAwClN1YmplY3Q6IFtQQVRDSCB2
MV0gRml4IDAwM19leHRyYWZpbGVzLnBsIHRlc3QgZm9yIHRoZSBXaW5kb3dzCgpGaWxlOjpGaW5k
IGNvbnZlcnRzIGJhY2tzbGFzaGVzIHRvIHNsYXNoZXMgaW4gdGhlIG5ld2VyIFBlcmwgdmVyc2lv
bnMuClNlZTogaHR0cHM6Ly9naXRodWIuY29tL1BlcmwvcGVybDUvY29tbWl0LzQxNGYxNGRmOThj
YjFjOWEyMGY5MmM1YzU0OTQ4YjY3YzA5ZjA3MmQKClNvLCBkbyB0aGUgc2FtZSBjb252ZXJzaW9u
IGZvciBXaW5kb3dzIGJlZm9yZSBjb21wYXJpbmcgcGF0aHMuIFRvCnN1cHBvcnQgYWxsIFBlcmwg
dmVyc2lvbnMsIGFsd2F5cyBjb252ZXJ0IHRoZW0gb24gV2luZG93cyByZWdhcmRsZXNzIG9mCnRo
ZSBQZXJsJ3MgdmVyc2lvbi4KLS0tCiBzcmMvYmluL3BnX3Jld2luZC90LzAwM19leHRyYWZpbGVz
LnBsIHwgMTMgKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKykK
CmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX3Jld2luZC90LzAwM19leHRyYWZpbGVzLnBsIGIvc3Jj
L2Jpbi9wZ19yZXdpbmQvdC8wMDNfZXh0cmFmaWxlcy5wbAppbmRleCBkNTRkY2RkY2JiNi4uN2U0
YzI3NzFjZTcgMTAwNjQ0Ci0tLSBhL3NyYy9iaW4vcGdfcmV3aW5kL3QvMDAzX2V4dHJhZmlsZXMu
cGwKKysrIGIvc3JjL2Jpbi9wZ19yZXdpbmQvdC8wMDNfZXh0cmFmaWxlcy5wbApAQCAtNzgsNiAr
NzgsMTkgQEAgc3ViIHJ1bl90ZXN0CiAJCX0sCiAJCSR0ZXN0X3ByaW1hcnlfZGF0YWRpcik7CiAJ
QHBhdGhzID0gc29ydCBAcGF0aHM7CisKKwkjIEZpbGU6OkZpbmQgY29udmVydHMgYmFja3NsYXNo
ZXMgdG8gc2xhc2hlcyBpbiB0aGUgbmV3ZXIgUGVybAorCSMgdmVyc2lvbnMuIFRvIHN1cHBvcnQg
YWxsIFBlcmwgdmVyc2lvbnMsIGRvIHRoZSBzYW1lIGNvbnZlcnNpb24KKwkjIGZvciBXaW5kb3dz
IGJlZm9yZSBjb21wYXJpbmcgdGhlIHBhdGhzLgorCWlmICgkUG9zdGdyZVNRTDo6VGVzdDo6VXRp
bHM6OndpbmRvd3Nfb3MpCisJeworCQlmb3IgbXkgJGZpbGVuYW1lIChAcGF0aHMpCisJCXsKKwkJ
CSRmaWxlbmFtZSA9fiBze1xcfXsvfWc7CisJCX0KKwkJJHRlc3RfcHJpbWFyeV9kYXRhZGlyID1+
IHN7XFx9ey99ZzsKKwl9CisKIAlpc19kZWVwbHkoCiAJCVxAcGF0aHMsCiAJCVsKLS0gCjIuNDMu
MAoK
--0000000000001e19c3061027f90f--