Skip to content

Commit 09aaa34

Browse files
Revert "Allow JIT fallback warnings in OPcache tests"
This reverts commit 825d2d9.
1 parent d9f17f6 commit 09aaa34

7 files changed

Lines changed: 9 additions & 9 deletions

File tree

ext/opcache/tests/bu69838.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ $x = gethostbyname("localhost");
1414

1515
?>
1616
===DONE===
17-
--EXPECTF--
18-
%r(?:.*: Warning Apple Silicon ZTS JIT requires pthread_jit_write_protect_np\(\) support\. JIT disabled\.\n)?%r===DONE===
17+
--EXPECT--
18+
===DONE===

ext/opcache/tests/bug70423.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ $fn2(); // 5
5454
$fn1(); // 1
5555
$fn2(); // 6
5656
?>
57-
--EXPECTF--
58-
%r(?:.*: Warning Apple Silicon ZTS JIT requires pthread_jit_write_protect_np\(\) support\. JIT disabled\.\n)?%r1
57+
--EXPECT--
58+
1
5959
1
6060
1
6161
1

ext/opcache/tests/bug79665.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var_dump($config['directives']['opcache.max_accelerated_files']);
2424

2525
%s: Warning opcache.max_wasted_percentage must be set between 1 and 50.
2626

27-
%r(?:.*: Warning Apple Silicon ZTS JIT requires pthread_jit_write_protect_np\(\) support\. JIT disabled\.\n)?%rstring(1) "5"
27+
string(1) "5"
2828
float(0.05)
2929
string(3) "128"
3030
int(134217728)

ext/opcache/tests/gh9259_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ echo 'OK';
1717
--EXPECTF--
1818
%sWarning opcache.interned_strings_buffer must be less than or equal to 32767, 131072 given%s
1919

20-
%r(?:.*: Warning Apple Silicon ZTS JIT requires pthread_jit_write_protect_np\(\) support\. JIT disabled\.\n)?%rOK
20+
OK

ext/opcache/tests/gh9259_002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ echo 'OK';
1515
--EXPECTF--
1616
%sWarning opcache.interned_strings_buffer must be greater than or equal to 0, -1 given%s
1717

18-
%r(?:.*: Warning Apple Silicon ZTS JIT requires pthread_jit_write_protect_np\(\) support\. JIT disabled\.\n)?%rOK
18+
OK

ext/opcache/tests/jit/gh16393.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ $appendProp2 = (function() {
1515
$appendProp2();
1616
?>
1717
--EXPECTF--
18-
%r(?:Warning: Cannot change opcache\.jit setting at run-time \(JIT is disabled\) in .*gh16393\.php on line 2\n\n)?%rWarning: Undefined variable $test in %sgh16393.php on line 6
18+
Warning: Undefined variable $test in %sgh16393.php on line 6

ext/opcache/tests/preload_user_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var_dump(function_exists("f2"));
2222
?>
2323
OK
2424
--EXPECTF--
25-
%r(?:.*: Warning Apple Silicon ZTS JIT requires pthread_jit_write_protect_np\(\) support\. JIT disabled\.\n)?%r%sWarning "opcache.preload_user" is ignored because the current user is not "root"
25+
%sWarning "opcache.preload_user" is ignored because the current user is not "root"
2626
bool(true)
2727
bool(false)
2828
OK

0 commit comments

Comments
 (0)