archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/standard/tests: 32bit wordwrap tests aren't just for Windows

Browse source 
The test in strings/wordwrap_memory_limit.phpt has a counterpart in
strings/wordwrap_memory_limit_win32.phpt. The two are conditional on
both the OS name and the size of an int (32- versus 64-bits).

A Gentoo Linux user has however reported that the 64-bit test fails on
a 32-bit system, with precisely the error message that the "win32"
test is expecting. I don't have any 32-bit hardware to test myself,
but I think it's reasonable to conclude that the OS name is not an
essential part of the test: it's simply 32- versus 64-bit.

This commit drops the conditionals for the OS name. Now one test will
be run on 32-bit systems, and the other on 64-bit systems, regardless
of the OS name.

Bug: https://bugs.gentoo.org/935382
This commit is contained in:
Michael Orlitzky 2024-07-03 19:42:17 -04:00 • committed by Niels Dossche
parent 89c3e0346a
commit 68a0efedeb
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/tests/strings/wordwrap_memory_limit.phpt
View file

@ -2,7 +2,7 @@
No overflow should occur during the memory_limit check for wordwrap() No overflow should occur during the memory_limit check for wordwrap()
--SKIPIF-- --SKIPIF--
<?php <?php
if (substr(PHP_OS, 0, 3) == 'WIN' && PHP_INT_SIZE == 4) die("skip this test is not for 32bit Windows platforms"); if (PHP_INT_SIZE == 4) die("skip this test is not for 32bit platforms");
if (getenv("USE_ZEND_ALLOC") === "0") die("skip Zend MM disabled"); if (getenv("USE_ZEND_ALLOC") === "0") die("skip Zend MM disabled");
?> ?>
--INI-- --INI--

2
ext/standard/tests/strings/wordwrap_memory_limit_win32.phpt → ext/standard/tests/strings/wordwrap_memory_limit_32bit.phpt
View file

@ -2,7 +2,7 @@
No overflow should occur during the memory_limit check for wordwrap() No overflow should occur during the memory_limit check for wordwrap()
--SKIPIF-- --SKIPIF--
<?php <?php
if (substr(PHP_OS, 0, 3) != 'WIN' || PHP_INT_SIZE != 4) die("skip this test is for 32bit Windows platforms only"); if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only");
if (getenv("USE_ZEND_ALLOC") === "0") die("skip Zend MM disabled"); if (getenv("USE_ZEND_ALLOC") === "0") die("skip Zend MM disabled");
?> ?>
--INI-- --INI--