From e48a5c14b914e69a1ea954071372cd23ebda0253 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Mon, 8 Apr 2024 20:16:35 +0200 Subject: [PATCH] Add zend_test.observer.enabled=0 to opcache tests asserting specific TMP count Necessary to succeed when tests are run with zend_test.observer.enabled=1. --- ext/opcache/tests/match/001.phpt | 1 + ext/opcache/tests/match/002.phpt | 1 + ext/opcache/tests/match/003.phpt | 1 + ext/opcache/tests/match/004.phpt | 1 + ext/opcache/tests/opt/coalesce.phpt | 1 + ext/opcache/tests/opt/dce_001.phpt | 1 + ext/opcache/tests/opt/dce_002.phpt | 1 + ext/opcache/tests/opt/dce_003.phpt | 1 + ext/opcache/tests/opt/dce_004.phpt | 1 + ext/opcache/tests/opt/dce_005.phpt | 1 + ext/opcache/tests/opt/dce_006.phpt | 1 + ext/opcache/tests/opt/dce_007.phpt | 1 + ext/opcache/tests/opt/dce_008.phpt | 1 + ext/opcache/tests/opt/dce_009.phpt | 1 + ext/opcache/tests/opt/gh11245_1.phpt | 1 + ext/opcache/tests/opt/gh11245_2.phpt | 1 + ext/opcache/tests/opt/jmp_001.phpt | 1 + ext/opcache/tests/opt/nullsafe_001.phpt | 1 + ext/opcache/tests/opt/sccp_001.phpt | 1 + ext/opcache/tests/opt/sccp_002.phpt | 1 + ext/opcache/tests/opt/sccp_003.phpt | 1 + ext/opcache/tests/opt/sccp_004.phpt | 1 + ext/opcache/tests/opt/sccp_005.phpt | 1 + ext/opcache/tests/opt/sccp_006.phpt | 1 + ext/opcache/tests/opt/sccp_007.phpt | 1 + ext/opcache/tests/opt/sccp_008.phpt | 1 + ext/opcache/tests/opt/sccp_009.phpt | 1 + ext/opcache/tests/opt/sccp_010.phpt | 1 + ext/opcache/tests/opt/sccp_011.phpt | 1 + ext/opcache/tests/opt/sccp_012.phpt | 1 + ext/opcache/tests/opt/sccp_016.phpt | 1 + ext/opcache/tests/opt/sccp_017.phpt | 1 + ext/opcache/tests/opt/sccp_019.phpt | 1 + ext/opcache/tests/opt/sccp_022.phpt | 1 + ext/opcache/tests/opt/sccp_024.phpt | 1 + ext/opcache/tests/opt/sccp_026.phpt | 1 + ext/opcache/tests/opt/sccp_031.phpt | 1 + ext/opcache/tests/opt/sccp_032.phpt | 1 + 38 files changed, 38 insertions(+) diff --git a/ext/opcache/tests/match/001.phpt b/ext/opcache/tests/match/001.phpt index 37f564b5bbc..502400681cf 100644 --- a/ext/opcache/tests/match/001.phpt +++ b/ext/opcache/tests/match/001.phpt @@ -4,6 +4,7 @@ Match expression string jump table opcache.enable=1 opcache.enable_cli=1 opcache.opt_debug_level=0x20000 +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/match/002.phpt b/ext/opcache/tests/match/002.phpt index 3743d6bed79..8e7102d5391 100644 --- a/ext/opcache/tests/match/002.phpt +++ b/ext/opcache/tests/match/002.phpt @@ -4,6 +4,7 @@ Test match jump table optimizer opcache.enable=1 opcache.enable_cli=1 opcache.opt_debug_level=0x20000 +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/match/003.phpt b/ext/opcache/tests/match/003.phpt index 9e55cbba942..24f3cd26121 100644 --- a/ext/opcache/tests/match/003.phpt +++ b/ext/opcache/tests/match/003.phpt @@ -4,6 +4,7 @@ Match expression long jump table opcache.enable=1 opcache.enable_cli=1 opcache.opt_debug_level=0x20000 +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/match/004.phpt b/ext/opcache/tests/match/004.phpt index 551c9a5d0e1..d9d4149b945 100644 --- a/ext/opcache/tests/match/004.phpt +++ b/ext/opcache/tests/match/004.phpt @@ -4,6 +4,7 @@ Match expression mixed jump table opcache.enable=1 opcache.enable_cli=1 opcache.opt_debug_level=0x20000 +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/coalesce.phpt b/ext/opcache/tests/opt/coalesce.phpt index 66a2e7f8274..f60294aadc2 100644 --- a/ext/opcache/tests/opt/coalesce.phpt +++ b/ext/opcache/tests/opt/coalesce.phpt @@ -5,6 +5,7 @@ opcache.enable=1 opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/dce_001.phpt b/ext/opcache/tests/opt/dce_001.phpt index 81e309fa496..5f9b001a5de 100644 --- a/ext/opcache/tests/opt/dce_001.phpt +++ b/ext/opcache/tests/opt/dce_001.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/dce_002.phpt b/ext/opcache/tests/opt/dce_002.phpt index 2f105fe352b..44f1fb403c2 100644 --- a/ext/opcache/tests/opt/dce_002.phpt +++ b/ext/opcache/tests/opt/dce_002.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/dce_003.phpt b/ext/opcache/tests/opt/dce_003.phpt index 5824eae5523..22355baa68d 100644 --- a/ext/opcache/tests/opt/dce_003.phpt +++ b/ext/opcache/tests/opt/dce_003.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/dce_004.phpt b/ext/opcache/tests/opt/dce_004.phpt index b49caceb0d7..2c7e785e4f5 100644 --- a/ext/opcache/tests/opt/dce_004.phpt +++ b/ext/opcache/tests/opt/dce_004.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/dce_005.phpt b/ext/opcache/tests/opt/dce_005.phpt index add703e966a..c413913aedb 100644 --- a/ext/opcache/tests/opt/dce_005.phpt +++ b/ext/opcache/tests/opt/dce_005.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/dce_006.phpt b/ext/opcache/tests/opt/dce_006.phpt index 97d29887939..2596651ed3e 100644 --- a/ext/opcache/tests/opt/dce_006.phpt +++ b/ext/opcache/tests/opt/dce_006.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/dce_007.phpt b/ext/opcache/tests/opt/dce_007.phpt index 0f4da98d059..9139e0478ec 100644 --- a/ext/opcache/tests/opt/dce_007.phpt +++ b/ext/opcache/tests/opt/dce_007.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/dce_008.phpt b/ext/opcache/tests/opt/dce_008.phpt index 0a55d83fb83..697e29f1ab3 100644 --- a/ext/opcache/tests/opt/dce_008.phpt +++ b/ext/opcache/tests/opt/dce_008.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/dce_009.phpt b/ext/opcache/tests/opt/dce_009.phpt index ea3032460cf..4300fdd1c5c 100644 --- a/ext/opcache/tests/opt/dce_009.phpt +++ b/ext/opcache/tests/opt/dce_009.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/gh11245_1.phpt b/ext/opcache/tests/opt/gh11245_1.phpt index eac085ac440..06d6da14137 100644 --- a/ext/opcache/tests/opt/gh11245_1.phpt +++ b/ext/opcache/tests/opt/gh11245_1.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=0x7FFFBFFF opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/gh11245_2.phpt b/ext/opcache/tests/opt/gh11245_2.phpt index 8e967bf9f41..f42da12c527 100644 --- a/ext/opcache/tests/opt/gh11245_2.phpt +++ b/ext/opcache/tests/opt/gh11245_2.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=0x7FFFBFFF opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/jmp_001.phpt b/ext/opcache/tests/opt/jmp_001.phpt index 23cd2f796a4..71ff73671e8 100644 --- a/ext/opcache/tests/opt/jmp_001.phpt +++ b/ext/opcache/tests/opt/jmp_001.phpt @@ -5,6 +5,7 @@ opcache.enable=1 opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/nullsafe_001.phpt b/ext/opcache/tests/opt/nullsafe_001.phpt index f0c31756413..171ac7190af 100644 --- a/ext/opcache/tests/opt/nullsafe_001.phpt +++ b/ext/opcache/tests/opt/nullsafe_001.phpt @@ -4,6 +4,7 @@ Nullsafe basic optimization opcache.enable=1 opcache.enable_cli=1 opcache.opt_debug_level=0x20000 +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_001.phpt b/ext/opcache/tests/opt/sccp_001.phpt index 20869eb6245..727a239e8f2 100644 --- a/ext/opcache/tests/opt/sccp_001.phpt +++ b/ext/opcache/tests/opt/sccp_001.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_002.phpt b/ext/opcache/tests/opt/sccp_002.phpt index 7dda1932e0f..b290d752e7e 100644 --- a/ext/opcache/tests/opt/sccp_002.phpt +++ b/ext/opcache/tests/opt/sccp_002.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_003.phpt b/ext/opcache/tests/opt/sccp_003.phpt index 3002efcc4a1..4db7fe4d13c 100644 --- a/ext/opcache/tests/opt/sccp_003.phpt +++ b/ext/opcache/tests/opt/sccp_003.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_004.phpt b/ext/opcache/tests/opt/sccp_004.phpt index 891fa0ed473..4a0a7598e49 100644 --- a/ext/opcache/tests/opt/sccp_004.phpt +++ b/ext/opcache/tests/opt/sccp_004.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_005.phpt b/ext/opcache/tests/opt/sccp_005.phpt index 1f56feee320..a673d3092de 100644 --- a/ext/opcache/tests/opt/sccp_005.phpt +++ b/ext/opcache/tests/opt/sccp_005.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_006.phpt b/ext/opcache/tests/opt/sccp_006.phpt index c8b6253e5c7..49754566e07 100644 --- a/ext/opcache/tests/opt/sccp_006.phpt +++ b/ext/opcache/tests/opt/sccp_006.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_007.phpt b/ext/opcache/tests/opt/sccp_007.phpt index 112b7791910..807ce7ed764 100644 --- a/ext/opcache/tests/opt/sccp_007.phpt +++ b/ext/opcache/tests/opt/sccp_007.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_008.phpt b/ext/opcache/tests/opt/sccp_008.phpt index f194249d351..f1df4b59980 100644 --- a/ext/opcache/tests/opt/sccp_008.phpt +++ b/ext/opcache/tests/opt/sccp_008.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_009.phpt b/ext/opcache/tests/opt/sccp_009.phpt index ca5ba96bc0c..34995a0546e 100644 --- a/ext/opcache/tests/opt/sccp_009.phpt +++ b/ext/opcache/tests/opt/sccp_009.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_010.phpt b/ext/opcache/tests/opt/sccp_010.phpt index e9dba9978cf..e4bf7211660 100644 --- a/ext/opcache/tests/opt/sccp_010.phpt +++ b/ext/opcache/tests/opt/sccp_010.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_011.phpt b/ext/opcache/tests/opt/sccp_011.phpt index cba27a0f245..78455aa0d80 100644 --- a/ext/opcache/tests/opt/sccp_011.phpt +++ b/ext/opcache/tests/opt/sccp_011.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_012.phpt b/ext/opcache/tests/opt/sccp_012.phpt index 203de5fa56a..dbd5ee4fd00 100644 --- a/ext/opcache/tests/opt/sccp_012.phpt +++ b/ext/opcache/tests/opt/sccp_012.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_016.phpt b/ext/opcache/tests/opt/sccp_016.phpt index 46154ad9f04..3e540ea6ce6 100644 --- a/ext/opcache/tests/opt/sccp_016.phpt +++ b/ext/opcache/tests/opt/sccp_016.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_017.phpt b/ext/opcache/tests/opt/sccp_017.phpt index 43cdc2ed2b6..5afc24bf60c 100644 --- a/ext/opcache/tests/opt/sccp_017.phpt +++ b/ext/opcache/tests/opt/sccp_017.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_019.phpt b/ext/opcache/tests/opt/sccp_019.phpt index e3453cd257f..00c8a34c2c0 100644 --- a/ext/opcache/tests/opt/sccp_019.phpt +++ b/ext/opcache/tests/opt/sccp_019.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_022.phpt b/ext/opcache/tests/opt/sccp_022.phpt index 595e4317527..ffcc48b0dcc 100644 --- a/ext/opcache/tests/opt/sccp_022.phpt +++ b/ext/opcache/tests/opt/sccp_022.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_024.phpt b/ext/opcache/tests/opt/sccp_024.phpt index 5fd33e2b7e1..56be429cc79 100644 --- a/ext/opcache/tests/opt/sccp_024.phpt +++ b/ext/opcache/tests/opt/sccp_024.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_026.phpt b/ext/opcache/tests/opt/sccp_026.phpt index 6d2108409b0..3e318a7f75d 100644 --- a/ext/opcache/tests/opt/sccp_026.phpt +++ b/ext/opcache/tests/opt/sccp_026.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_031.phpt b/ext/opcache/tests/opt/sccp_031.phpt index 73b5906df64..459fb31233d 100644 --- a/ext/opcache/tests/opt/sccp_031.phpt +++ b/ext/opcache/tests/opt/sccp_031.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE-- diff --git a/ext/opcache/tests/opt/sccp_032.phpt b/ext/opcache/tests/opt/sccp_032.phpt index 9a03fe4e1d5..dac09a75527 100644 --- a/ext/opcache/tests/opt/sccp_032.phpt +++ b/ext/opcache/tests/opt/sccp_032.phpt @@ -6,6 +6,7 @@ opcache.enable_cli=1 opcache.optimization_level=-1 opcache.opt_debug_level=0x20000 opcache.preload= +zend_test.observer.enabled=0 --EXTENSIONS-- opcache --FILE--