Skip to content

POC run-tests.php: avoid SKIPIF evaluation in subprocesses #16664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

POC run-tests.php: avoid SKIPIF evaluation in subprocesses #16664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e1e1d9
Adjust intl tests
staabm Nov 1, 2024
984d129
run-tests: run side-effect free SKIPIF in main process
staabm Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/intl/tests/breakiter_getLocale_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ IntlBreakIterator::getLocale(): basic test
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '53.1') >= 0) die('skip for ICU < 53.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '53.1') >= 0) echo 'skip for ICU < 53.1'; ?>
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
Expand Down
4 changes: 2 additions & 2 deletions ext/intl/tests/breakiter_getLocale_basic2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ IntlBreakIterator::getLocale(): basic test
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) die('skip for ICU >= 53.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '64.0') >= 0) die('skip for ICU < 64.0'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) echo 'skip for ICU >= 53.1'; ?>
<?php if (version_compare(INTL_ICU_VERSION, '64.0') >= 0) echo 'skip for ICU < 64.0'; ?>
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/breakiter_getLocale_basic3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ IntlBreakIterator::getLocale(): basic test
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '64.0') < 0) die('skip for ICU >= 64.0'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '64.0') < 0) echo 'skip for ICU >= 64.0'; ?>
--FILE--
<?php
ini_set("intl.error_level", E_WARNING);
Expand Down
4 changes: 2 additions & 2 deletions ext/intl/tests/breakiter_getPartsIterator_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IntlBreakIterator::getPartsIterator(): basic test, ICU <= 57.1
intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '57.1') > 0) die('skip for ICU <= 57.1');
if (version_compare(INTL_ICU_VERSION, '57.1') > 0) echo 'skip for ICU <= 57.1';
?>
--FILE--
<?php
Expand All @@ -31,7 +31,7 @@ string(26) "IntlRuleBasedBreakIterator"
Array
(
[0] => foo
[1] =>
[1] =>
[2] => bar
)
int(0)
4 changes: 2 additions & 2 deletions ext/intl/tests/breakiter_getPartsIterator_basic2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IntlBreakIterator::getPartsIterator(): basic test, ICU >= 58.1
intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) die('skip for ICU >= 58.1');
if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) echo 'skip for ICU >= 58.1';
?>
--FILE--
<?php
Expand All @@ -31,7 +31,7 @@ string(26) "IntlRuleBasedBreakIterator"
Array
(
[0] => foo
[1] =>
[1] =>
[2] => bar
)
int(%d)
2 changes: 1 addition & 1 deletion ext/intl/tests/breakiter_preceding_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IntlBreakIterator::preceding(): basic test, ICU <= 57.1
intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '57.1') > 0) die('skip for ICU <= 57.1');
if (version_compare(INTL_ICU_VERSION, '57.1') > 0) echo 'skip for ICU <= 57.1';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/breakiter_preceding_basic2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IntlBreakIterator::preceding(): basic test, ICU >= 58.1
intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) die('skip for ICU >= 58.1');
if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) echo 'skip for ICU >= 58.1';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug53512.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values)
--EXTENSIONS--
intl
--SKIPIF--
<?php if (PHP_INT_SIZE != 8) die('skip 64-bit only');
<?php if (PHP_INT_SIZE != 8) echo 'skip 64-bit only';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug53735.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bug #53735 NumberFormatter returns NaN when converting float point
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) echo 'skip for ICU >= 51.2'; ?>
--FILE--
<?php

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug58756_MessageFormatter.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '51.2') >= 0)
die('skip for ICU < 51.2');
echo 'skip for ICU < 51.2';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug58756_MessageFormatter_variant2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ intl
<?php

if (version_compare(INTL_ICU_VERSION, '51.2') < 0) {
die('skip for ICU >= 51.2');
echo 'skip for ICU >= 51.2';
}
if (str_contains(PHP_OS, 'FreeBSD')) {
die('xfail Fails on FreeBSD for unknown reason');
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug61487.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ grapheme() str[i]pos limits
--EXTENSIONS--
intl
--SKIPIF--
<?php if (PHP_INT_SIZE != 8) die('skip 64-bit only');
<?php if (PHP_INT_SIZE != 8) echo 'skip 64-bit only';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug62070.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bug #62070: Collator::getSortKey() returns garbage
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '53.1') >= 0) die('skip for ICU < 53.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '53.1') >= 0) echo 'skip for ICU < 53.1'; ?>
--FILE--
<?php
$s1 = 'Hello';
Expand Down
4 changes: 2 additions & 2 deletions ext/intl/tests/bug62070_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bug #62070: Collator::getSortKey() returns garbage
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) die('skip for ICU >= 53.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '62.1') >= 0) die('skip for ICU < 62.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) echo 'skip for ICU >= 53.1'; ?>
<?php if (version_compare(INTL_ICU_VERSION, '62.1') >= 0) echo 'skip for ICU < 62.1'; ?>
--FILE--
<?php
$s1 = 'Hello';
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug62070_3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bug #62070: Collator::getSortKey() returns garbage
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '62.1') < 0) die('skip for ICU >= 62.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '62.1') < 0) echo 'skip for ICU >= 62.1'; ?>
--FILE--
<?php
$s1 = 'Hello';
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug62915-2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ intl
--SKIPIF--
<?php
if (!class_exists('Spoofchecker'))
die('skip intl extension does not have spoof checker');
echo 'skip intl extension does not have spoof checker';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug69374.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ IntlDateFormatter::formatObject(): returns wrong utf8 value when $format param i
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '50.1.2') < 0) die('skip for ICU >= 51.1.2'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '50.1.2') < 0) echo 'skip for ICU >= 51.1.2'; ?>
--FILE--
<?php
$millitimestamp = 1428133423941.0; // 14:43:43 April 04 2015
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug69398-icu74.1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IntlDateFormatter::formatObject(): returns wrong value when time style is NONE.
intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '74.1') < 0) die('skip for ICU < 74.1');
if (version_compare(INTL_ICU_VERSION, '74.1') < 0) echo 'skip for ICU < 74.1';
?>
--FILE--
<?php
Expand Down
4 changes: 2 additions & 2 deletions ext/intl/tests/bug69398.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ IntlDateFormatter::formatObject(): returns wrong value when time style is NONE.
intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '50.1.2') < 0) die('skip for ICU < 51.1.2');
if (version_compare(INTL_ICU_VERSION, '74.1') >= 0) die('skip for ICU >= 74.1');
if (version_compare(INTL_ICU_VERSION, '50.1.2') < 0) echo 'skip for ICU < 51.1.2';
if (version_compare(INTL_ICU_VERSION, '74.1') >= 0) echo 'skip for ICU >= 74.1';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug72506.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ not clear yet with which values exactly.
intl
--SKIPIF--
<?php
if (!defined('INTL_IDNA_VARIANT_UTS46')) die('skip no UTS #46 API');
if (!defined('INTL_IDNA_VARIANT_UTS46')) echo 'skip no UTS #46 API';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug74468.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bug #74468 Wrong reflection on Collator::sortWithSortKeys
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) echo 'skip for ICU < 51.2'; ?>
--FILE--
<?php
$rm = new ReflectionMethod(Collator::class, 'sortWithSortKeys');
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/bug78912.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Request #78912 (INTL Support for accounting format)
intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '53.0') < 0) die('skip for ICU >= 53.0');
if (version_compare(INTL_ICU_VERSION, '53.0') < 0) echo 'skip for ICU >= 53.0';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/calendar_clear_variation1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '73.1') >= 0 && version_compare(INTL_ICU_VERSION, '74.1') < 0) {
die('skip Broken for ICU >= 73.1 and < 74.1, see https://github.com/php/php-src/issues/11128');
echo 'skip Broken for ICU >= 73.1 and < 74.1, see https://github.com/php/php-src/issues/11128';
}
?>
--FILE--
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/calendar_getDayOfWeekType_basic.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '52.1') >= 0)
die('skip for ICU < 52.1');
echo 'skip for ICU < 52.1';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/calendar_getDayOfWeekType_basic2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ intl
--SKIPIF--
<?php
if (version_compare(INTL_ICU_VERSION, '52.1') < 0)
die('skip for ICU >= 52.1');
echo 'skip for ICU >= 52.1';
?>
--FILE--
<?php
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/collator_asort.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ asort()
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) echo 'skip for ICU < 51.2'; ?>
--FILE--
<?php

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/collator_asort_variant2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ asort()
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) echo 'skip for ICU >= 51.2'; ?>
--FILE--
<?php

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/collator_compare.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ compare()
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) echo 'skip for ICU < 51.2'; ?>
--FILE--
<?php

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/collator_compare_variant2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ compare()
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) echo 'skip for ICU >= 51.2'; ?>
--FILE--
<?php

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/collator_create2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ create() icu >= 4.8 && icu < 53.1
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '53.1') >= 0) die('skip for ICU < 53.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '53.1') >= 0) echo 'skip for ICU < 53.1'; ?>
--FILE--
<?php

Expand Down
4 changes: 2 additions & 2 deletions ext/intl/tests/collator_create3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ create() icu >= 53.1 && icu < 54.1
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) die('skip for ICU >= 53.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '54.1') >= 0) die('skip for ICU < 54.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) echo 'skip for ICU >= 53.1'; ?>
<?php if (version_compare(INTL_ICU_VERSION, '54.1') >= 0) echo 'skip for ICU < 54.1'; ?>
--FILE--
<?php

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/collator_create4.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ create() icu >= 53.1
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) die('skip for ICU >= 54.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '54.1') < 0) echo 'skip for ICU >= 54.1'; ?>
--FILE--
<?php

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/tests/collator_get_locale2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ get_locale() icu >= 4.8
--EXTENSIONS--
intl
--SKIPIF--
<?php if (PHP_INT_SIZE != 8) die('skip 64-bit only'); ?>
<?php if (PHP_INT_SIZE != 8) echo 'skip 64-bit only'; ?>
--FILE--
<?php

Expand Down
6 changes: 3 additions & 3 deletions ext/intl/tests/collator_get_sort_key.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ collator_get_sort_key()
intl
--SKIPIF--
<?php /* XXX Obviously it fails somewhere between >= 4.8 and < 51.2 */
if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) die('skip for ICU < 51.2'); ?>
if (version_compare(INTL_ICU_VERSION, '51.2') >= 0) echo 'skip for ICU < 51.2'; ?>
--FILE--
<?php

Expand Down Expand Up @@ -70,9 +70,9 @@ source: а
key: 5c0a01050105
source: z
key: 5901050105
source:
source:
key: 0101
source:
source:
key: 0101
source: 3
key: 1801050105
Expand Down
6 changes: 3 additions & 3 deletions ext/intl/tests/collator_get_sort_key_variant2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ collator_get_sort_key()
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '53.1') >= 0) die('skip for ICU < 53.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) echo 'skip for ICU >= 51.2'; ?>
<?php if (version_compare(INTL_ICU_VERSION, '53.1') >= 0) echo 'skip for ICU < 53.1'; ?>
--FILE--
<?php

Expand Down Expand Up @@ -70,7 +70,7 @@ source: а
key: 5c0a01050105
source: z
key: 5901050105
source:
source:
key: 0101
source: 3
key: 1801050105
Expand Down
6 changes: 3 additions & 3 deletions ext/intl/tests/collator_get_sort_key_variant3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ collator_get_sort_key() icu >= 53.1 && icu < 54.1
--EXTENSIONS--
intl
--SKIPIF--
<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) die('skip for ICU >= 53.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '54.1') >= 0) die('skip for ICU < 54.1'); ?>
<?php if (version_compare(INTL_ICU_VERSION, '53.1') < 0) echo 'skip for ICU >= 53.1'; ?>
<?php if (version_compare(INTL_ICU_VERSION, '54.1') >= 0) echo 'skip for ICU < 54.1'; ?>
--FILE--
<?php

Expand Down Expand Up @@ -70,7 +70,7 @@ source: а
key: 5e0901050105
source: z
key: 5b01050105
source:
source:
key: 0101
source: 3
key: 1a01050105
Expand Down
Loading
Loading