From 607156b27a07b83ac1ae240dc43723c60b0e3054 Mon Sep 17 00:00:00 2001
From: Florian Sowade <f.sowade@suora.com>
Date: Sat, 29 Oct 2022 14:11:25 +0200
Subject: [PATCH] Add option to run all tests with active observers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some bugs only happen when observers are registered. This change makes it possible to register observers from the zend_test extension in all tests. The observers don’t really do anything, but just by being registered some bugs in the observer implementation can be caught.

The full test suite can be run with observers by executing `TEST_PHP_ARGS='--with-test-observers' make test`.
---
 .../tests/observer_backtrace_01.phpt          |  1 +
 ext/zend_test/tests/observer_basic_01.phpt    |  1 +
 ext/zend_test/tests/observer_basic_02.phpt    |  1 +
 ext/zend_test/tests/observer_basic_03.phpt    |  1 +
 ext/zend_test/tests/observer_basic_04.phpt    |  2 ++
 ext/zend_test/tests/observer_basic_05.phpt    |  2 ++
 ext/zend_test/tests/observer_basic_06.phpt    |  2 ++
 ext/zend_test/tests/observer_bug81430_1.phpt  |  1 +
 ext/zend_test/tests/observer_bug81430_2.phpt  |  1 +
 ext/zend_test/tests/observer_bug81435.phpt    |  2 ++
 .../tests/observer_call_user_func_01.phpt     |  1 +
 .../tests/observer_call_user_func_02.phpt     |  1 +
 .../tests/observer_call_user_func_03.phpt     |  1 +
 .../tests/observer_call_user_func_04.phpt     |  1 +
 ext/zend_test/tests/observer_closure_01.phpt  |  1 +
 ext/zend_test/tests/observer_closure_02.phpt  |  1 +
 .../tests/observer_declarations_01.phpt       |  1 +
 .../observer_declarations_file_cache.phpt     |  2 ++
 ext/zend_test/tests/observer_error_01.phpt    |  1 +
 ext/zend_test/tests/observer_error_02.phpt    |  1 +
 ext/zend_test/tests/observer_error_03.phpt    |  1 +
 ext/zend_test/tests/observer_error_04.phpt    |  1 +
 ext/zend_test/tests/observer_error_05.phpt    |  1 +
 ext/zend_test/tests/observer_eval_01.phpt     |  1 +
 .../tests/observer_exception_01.phpt          |  1 +
 ext/zend_test/tests/observer_fiber_01.phpt    |  2 ++
 ext/zend_test/tests/observer_fiber_02.phpt    |  2 ++
 ext/zend_test/tests/observer_fiber_03.phpt    |  2 ++
 ext/zend_test/tests/observer_fiber_04.phpt    |  2 ++
 ext/zend_test/tests/observer_fiber_05.phpt    |  2 ++
 ext/zend_test/tests/observer_fiber_06.phpt    |  2 ++
 .../tests/observer_fiber_functions_01.phpt    |  1 +
 .../tests/observer_fiber_functions_02.phpt    |  1 +
 .../tests/observer_fiber_functions_03.phpt    |  1 +
 .../tests/observer_generator_01.phpt          |  1 +
 .../tests/observer_generator_02.phpt          |  1 +
 .../tests/observer_generator_03.phpt          |  1 +
 .../tests/observer_generator_04.phpt          |  1 +
 .../tests/observer_generator_05.phpt          |  1 +
 ext/zend_test/tests/observer_magic_01.phpt    |  1 +
 ext/zend_test/tests/observer_opline_01.phpt   |  1 +
 ext/zend_test/tests/observer_retval_01.phpt   |  1 +
 ext/zend_test/tests/observer_retval_02.phpt   |  1 +
 ext/zend_test/tests/observer_retval_03.phpt   |  1 +
 ext/zend_test/tests/observer_retval_04.phpt   |  1 +
 ext/zend_test/tests/observer_retval_05.phpt   |  1 +
 ext/zend_test/tests/observer_retval_06.phpt   |  1 +
 ext/zend_test/tests/observer_retval_07.phpt   |  1 +
 .../tests/observer_retval_by_ref_01.phpt      |  1 +
 .../tests/observer_retval_by_ref_02.phpt      |  1 +
 .../tests/observer_retval_by_ref_03.phpt      |  1 +
 ext/zend_test/tests/observer_shutdown_01.phpt |  1 +
 ext/zend_test/tests/observer_shutdown_02.phpt |  1 +
 .../observer_sqlite_create_function.phpt      |  1 +
 ext/zend_test/tests/observer_types_01.phpt    |  1 +
 .../tests/observer_zend_call_function_01.phpt |  1 +
 run-tests.php                                 | 19 ++++++++++++++++---
 57 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/ext/zend_test/tests/observer_backtrace_01.phpt b/ext/zend_test/tests/observer_backtrace_01.phpt
index 7f021bf40251..147d30db88a0 100644
--- a/ext/zend_test/tests/observer_backtrace_01.phpt
+++ b/ext/zend_test/tests/observer_backtrace_01.phpt
@@ -6,6 +6,7 @@ zend_test
 zend_test.observer.enabled=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_init_backtrace=1
+zend_test.observer.show_output=1
 --FILE--
 <?php
 class TestClass
diff --git a/ext/zend_test/tests/observer_basic_01.phpt b/ext/zend_test/tests/observer_basic_01.phpt
index b208ae2341e8..435a46c8407e 100644
--- a/ext/zend_test/tests/observer_basic_01.phpt
+++ b/ext/zend_test/tests/observer_basic_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of userland functions
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_basic_02.phpt b/ext/zend_test/tests/observer_basic_02.phpt
index ac61a8b18e72..ad79ac31f0e4 100644
--- a/ext/zend_test/tests/observer_basic_02.phpt
+++ b/ext/zend_test/tests/observer_basic_02.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of userland methods
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_basic_03.phpt b/ext/zend_test/tests/observer_basic_03.phpt
index f98390a0c986..3d60550ce605 100644
--- a/ext/zend_test/tests/observer_basic_03.phpt
+++ b/ext/zend_test/tests/observer_basic_03.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of includes
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_basic_04.phpt b/ext/zend_test/tests/observer_basic_04.phpt
index 1b55f6da3d27..1fca32a98707 100644
--- a/ext/zend_test/tests/observer_basic_04.phpt
+++ b/ext/zend_test/tests/observer_basic_04.phpt
@@ -4,6 +4,8 @@ Observer: Basic observability of includes only (no functions)
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.observe_includes=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_basic_05.phpt b/ext/zend_test/tests/observer_basic_05.phpt
index 1891cd87ae49..fa50c25b652d 100644
--- a/ext/zend_test/tests/observer_basic_05.phpt
+++ b/ext/zend_test/tests/observer_basic_05.phpt
@@ -4,6 +4,8 @@ Observer: Basic observability of functions only (no includes)
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.observe_functions=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_basic_06.phpt b/ext/zend_test/tests/observer_basic_06.phpt
index d27c340db198..b4b8a7e540c9 100644
--- a/ext/zend_test/tests/observer_basic_06.phpt
+++ b/ext/zend_test/tests/observer_basic_06.phpt
@@ -4,6 +4,8 @@ Observer: Basic observability of functions only (with run-time swapping)
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.observe_function_names=foo
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_bug81430_1.phpt b/ext/zend_test/tests/observer_bug81430_1.phpt
index 34ac119e5444..aedfc09ed249 100644
--- a/ext/zend_test/tests/observer_bug81430_1.phpt
+++ b/ext/zend_test/tests/observer_bug81430_1.phpt
@@ -5,6 +5,7 @@ zend_test
 --INI--
 memory_limit=20M
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_bug81430_2.phpt b/ext/zend_test/tests/observer_bug81430_2.phpt
index dc4d29e3e382..11a9f061b3d4 100644
--- a/ext/zend_test/tests/observer_bug81430_2.phpt
+++ b/ext/zend_test/tests/observer_bug81430_2.phpt
@@ -5,6 +5,7 @@ zend_test
 --INI--
 memory_limit=20M
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --SKIPIF--
 <?php
diff --git a/ext/zend_test/tests/observer_bug81435.phpt b/ext/zend_test/tests/observer_bug81435.phpt
index 9007575c5453..ceec29ba0bca 100644
--- a/ext/zend_test/tests/observer_bug81435.phpt
+++ b/ext/zend_test/tests/observer_bug81435.phpt
@@ -5,6 +5,8 @@ zend_test
 --INI--
 memory_limit=20M
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.observe_function_names=a,d
 opcache.optimization_level=0
 --SKIPIF--
diff --git a/ext/zend_test/tests/observer_call_user_func_01.phpt b/ext/zend_test/tests/observer_call_user_func_01.phpt
index f4a25a037231..8e40f44c2ecd 100644
--- a/ext/zend_test/tests/observer_call_user_func_01.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_01.phpt
@@ -4,6 +4,7 @@ Observer: call_user_func() from root namespace
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_call_user_func_02.phpt b/ext/zend_test/tests/observer_call_user_func_02.phpt
index 30a4b08f3fc0..958348b151db 100644
--- a/ext/zend_test/tests/observer_call_user_func_02.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_02.phpt
@@ -4,6 +4,7 @@ Observer: call_user_func_array() from root namespace
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_call_user_func_03.phpt b/ext/zend_test/tests/observer_call_user_func_03.phpt
index 4eef414747d0..5e1932bc5703 100644
--- a/ext/zend_test/tests/observer_call_user_func_03.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_03.phpt
@@ -4,6 +4,7 @@ Observer: call_user_func() from namespace
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_call_user_func_04.phpt b/ext/zend_test/tests/observer_call_user_func_04.phpt
index 97921a70df7b..679a82407ce0 100644
--- a/ext/zend_test/tests/observer_call_user_func_04.phpt
+++ b/ext/zend_test/tests/observer_call_user_func_04.phpt
@@ -4,6 +4,7 @@ Observer: call_user_func_array() from namespace
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_closure_01.phpt b/ext/zend_test/tests/observer_closure_01.phpt
index 2778d277225b..bee5c5e34afa 100644
--- a/ext/zend_test/tests/observer_closure_01.phpt
+++ b/ext/zend_test/tests/observer_closure_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of closures
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_closure_02.phpt b/ext/zend_test/tests/observer_closure_02.phpt
index ce75ccd12e07..59acf4938040 100644
--- a/ext/zend_test/tests/observer_closure_02.phpt
+++ b/ext/zend_test/tests/observer_closure_02.phpt
@@ -4,6 +4,7 @@ Observer: Observability of fake closures
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_declarations_01.phpt b/ext/zend_test/tests/observer_declarations_01.phpt
index 6d91834ef9fb..c03d72ed0940 100644
--- a/ext/zend_test/tests/observer_declarations_01.phpt
+++ b/ext/zend_test/tests/observer_declarations_01.phpt
@@ -4,6 +4,7 @@ Observer: Observe function and class declarations
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.observe_declaring=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_declarations_file_cache.phpt b/ext/zend_test/tests/observer_declarations_file_cache.phpt
index df20e359c0e5..8940474baa2b 100644
--- a/ext/zend_test/tests/observer_declarations_file_cache.phpt
+++ b/ext/zend_test/tests/observer_declarations_file_cache.phpt
@@ -4,6 +4,8 @@ Observer: Observe function and class declarations with file_cache_only
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.observe_declaring=1
 opcache.enable_cli=1
 opcache.file_cache={TMP}
diff --git a/ext/zend_test/tests/observer_error_01.phpt b/ext/zend_test/tests/observer_error_01.phpt
index 971080089c10..d20a23b00b29 100644
--- a/ext/zend_test/tests/observer_error_01.phpt
+++ b/ext/zend_test/tests/observer_error_01.phpt
@@ -4,6 +4,7 @@ Observer: End handlers fire after a fatal error
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 memory_limit=2M
diff --git a/ext/zend_test/tests/observer_error_02.phpt b/ext/zend_test/tests/observer_error_02.phpt
index 58b2d5ea80ef..f1c1500135b4 100644
--- a/ext/zend_test/tests/observer_error_02.phpt
+++ b/ext/zend_test/tests/observer_error_02.phpt
@@ -4,6 +4,7 @@ Observer: End handlers fire after a userland fatal error
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_error_03.phpt b/ext/zend_test/tests/observer_error_03.phpt
index b9f5ae75cc0d..4289d86089a1 100644
--- a/ext/zend_test/tests/observer_error_03.phpt
+++ b/ext/zend_test/tests/observer_error_03.phpt
@@ -4,6 +4,7 @@ Observer: non-fatal errors do not fire end handlers prematurely
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_error_04.phpt b/ext/zend_test/tests/observer_error_04.phpt
index f8c68ebeedaa..bb3ee1013ec4 100644
--- a/ext/zend_test/tests/observer_error_04.phpt
+++ b/ext/zend_test/tests/observer_error_04.phpt
@@ -5,6 +5,7 @@ zend_test
 soap
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_error_05.phpt b/ext/zend_test/tests/observer_error_05.phpt
index 9debfc2b0ad2..2405fcb25423 100644
--- a/ext/zend_test/tests/observer_error_05.phpt
+++ b/ext/zend_test/tests/observer_error_05.phpt
@@ -4,6 +4,7 @@ Observer: End handlers fire after a userland fatal error
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_eval_01.phpt b/ext/zend_test/tests/observer_eval_01.phpt
index 7f9ff53acba1..2b63c752d3c8 100644
--- a/ext/zend_test/tests/observer_eval_01.phpt
+++ b/ext/zend_test/tests/observer_eval_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic eval observability
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_exception_01.phpt b/ext/zend_test/tests/observer_exception_01.phpt
index 2c296991e402..e40d76fae91e 100644
--- a/ext/zend_test/tests/observer_exception_01.phpt
+++ b/ext/zend_test/tests/observer_exception_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic observability of userland functions with uncaught exceptions
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_01.phpt b/ext/zend_test/tests/observer_fiber_01.phpt
index a70df36b0bbc..13bb4d91cd35 100644
--- a/ext/zend_test/tests/observer_fiber_01.phpt
+++ b/ext/zend_test/tests/observer_fiber_01.phpt
@@ -4,6 +4,8 @@ Observer: Basic fiber switching
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.fiber_init=1
 zend_test.observer.fiber_switch=1
 zend_test.observer.fiber_destroy=1
diff --git a/ext/zend_test/tests/observer_fiber_02.phpt b/ext/zend_test/tests/observer_fiber_02.phpt
index 34fe42c10f20..45d97418d92f 100644
--- a/ext/zend_test/tests/observer_fiber_02.phpt
+++ b/ext/zend_test/tests/observer_fiber_02.phpt
@@ -4,6 +4,8 @@ Observer: Unfinished fiber
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.fiber_switch=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_03.phpt b/ext/zend_test/tests/observer_fiber_03.phpt
index d55e8d9e84c9..5ab1e3192f3d 100644
--- a/ext/zend_test/tests/observer_fiber_03.phpt
+++ b/ext/zend_test/tests/observer_fiber_03.phpt
@@ -4,6 +4,8 @@ Observer: Nested fibers
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.fiber_switch=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_04.phpt b/ext/zend_test/tests/observer_fiber_04.phpt
index 29e1b2d08685..b2e1147163ad 100644
--- a/ext/zend_test/tests/observer_fiber_04.phpt
+++ b/ext/zend_test/tests/observer_fiber_04.phpt
@@ -4,6 +4,8 @@ Observer: Nested fibers with unfinished fiber
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.fiber_switch=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_05.phpt b/ext/zend_test/tests/observer_fiber_05.phpt
index ce589033f97f..00111ffe1569 100644
--- a/ext/zend_test/tests/observer_fiber_05.phpt
+++ b/ext/zend_test/tests/observer_fiber_05.phpt
@@ -4,6 +4,8 @@ Observer: Nested fibers with both unfinished
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.fiber_switch=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_06.phpt b/ext/zend_test/tests/observer_fiber_06.phpt
index 7176336c5ffa..1abb538ee897 100644
--- a/ext/zend_test/tests/observer_fiber_06.phpt
+++ b/ext/zend_test/tests/observer_fiber_06.phpt
@@ -4,6 +4,8 @@ Observer: Throwing fiber
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
+zend_test.observer.observe_all=0
 zend_test.observer.fiber_switch=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_fiber_functions_01.phpt b/ext/zend_test/tests/observer_fiber_functions_01.phpt
index d3d395bd302f..61c27a783ed4 100644
--- a/ext/zend_test/tests/observer_fiber_functions_01.phpt
+++ b/ext/zend_test/tests/observer_fiber_functions_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic function observing in fibers
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.fiber_init=1
 zend_test.observer.fiber_switch=1
diff --git a/ext/zend_test/tests/observer_fiber_functions_02.phpt b/ext/zend_test/tests/observer_fiber_functions_02.phpt
index c2b7eb007fae..7d3df3a43e21 100644
--- a/ext/zend_test/tests/observer_fiber_functions_02.phpt
+++ b/ext/zend_test/tests/observer_fiber_functions_02.phpt
@@ -4,6 +4,7 @@ Observer: Function observing in fibers with unfinished fiber
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.fiber_init=1
 zend_test.observer.fiber_switch=1
diff --git a/ext/zend_test/tests/observer_fiber_functions_03.phpt b/ext/zend_test/tests/observer_fiber_functions_03.phpt
index d96390068a2f..3468120ef4b5 100644
--- a/ext/zend_test/tests/observer_fiber_functions_03.phpt
+++ b/ext/zend_test/tests/observer_fiber_functions_03.phpt
@@ -4,6 +4,7 @@ Observer: Function observing in fibers with bailout in fiber
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.fiber_init=1
 zend_test.observer.fiber_switch=1
diff --git a/ext/zend_test/tests/observer_generator_01.phpt b/ext/zend_test/tests/observer_generator_01.phpt
index f7170aad3388..46e0a9fabc0d 100644
--- a/ext/zend_test/tests/observer_generator_01.phpt
+++ b/ext/zend_test/tests/observer_generator_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic generator observability
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_generator_02.phpt b/ext/zend_test/tests/observer_generator_02.phpt
index 08c0992e442b..e008d20993ac 100644
--- a/ext/zend_test/tests/observer_generator_02.phpt
+++ b/ext/zend_test/tests/observer_generator_02.phpt
@@ -4,6 +4,7 @@ Observer: Generator with explicit return
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_generator_03.phpt b/ext/zend_test/tests/observer_generator_03.phpt
index 9022cd334560..4c6bd8935af9 100644
--- a/ext/zend_test/tests/observer_generator_03.phpt
+++ b/ext/zend_test/tests/observer_generator_03.phpt
@@ -4,6 +4,7 @@ Observer: Generator with 'yield from'
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_generator_04.phpt b/ext/zend_test/tests/observer_generator_04.phpt
index 00cc999ace66..a6c86afab4d5 100644
--- a/ext/zend_test/tests/observer_generator_04.phpt
+++ b/ext/zend_test/tests/observer_generator_04.phpt
@@ -4,6 +4,7 @@ Observer: Generator with manual traversal
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_generator_05.phpt b/ext/zend_test/tests/observer_generator_05.phpt
index dc750bf3ca5a..dcf8a3897b2d 100644
--- a/ext/zend_test/tests/observer_generator_05.phpt
+++ b/ext/zend_test/tests/observer_generator_05.phpt
@@ -4,6 +4,7 @@ Observer: Generator with uncaught exception
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_magic_01.phpt b/ext/zend_test/tests/observer_magic_01.phpt
index 0f89fba77f38..51969df57048 100644
--- a/ext/zend_test/tests/observer_magic_01.phpt
+++ b/ext/zend_test/tests/observer_magic_01.phpt
@@ -4,6 +4,7 @@ Observer: Basic magic method observability
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_opline_01.phpt b/ext/zend_test/tests/observer_opline_01.phpt
index 6798d39de6f3..ba291d6debb3 100644
--- a/ext/zend_test/tests/observer_opline_01.phpt
+++ b/ext/zend_test/tests/observer_opline_01.phpt
@@ -4,6 +4,7 @@ Observer: Ensure opline exists on the execute_data
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_opcode=1
 opcache.jit=0
diff --git a/ext/zend_test/tests/observer_retval_01.phpt b/ext/zend_test/tests/observer_retval_01.phpt
index a63b0bd0efc8..249796ec5ffe 100644
--- a/ext/zend_test/tests/observer_retval_01.phpt
+++ b/ext/zend_test/tests/observer_retval_01.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_CONST
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 opcache.optimization_level=0
diff --git a/ext/zend_test/tests/observer_retval_02.phpt b/ext/zend_test/tests/observer_retval_02.phpt
index 4f037782e4e9..e406a8d57930 100644
--- a/ext/zend_test/tests/observer_retval_02.phpt
+++ b/ext/zend_test/tests/observer_retval_02.phpt
@@ -4,6 +4,7 @@ Observer: Unused retvals from generators are still observable
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_03.phpt b/ext/zend_test/tests/observer_retval_03.phpt
index 247c56480b0f..bf004cd37f15 100644
--- a/ext/zend_test/tests/observer_retval_03.phpt
+++ b/ext/zend_test/tests/observer_retval_03.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: refcounted, IS_CV
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_04.phpt b/ext/zend_test/tests/observer_retval_04.phpt
index a08a5de378ed..876c30896648 100644
--- a/ext/zend_test/tests/observer_retval_04.phpt
+++ b/ext/zend_test/tests/observer_retval_04.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: refcounted, IS_VAR
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_05.phpt b/ext/zend_test/tests/observer_retval_05.phpt
index 7d05cb92986b..81752236696c 100644
--- a/ext/zend_test/tests/observer_retval_05.phpt
+++ b/ext/zend_test/tests/observer_retval_05.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_CV, IS_UNDEF
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_06.phpt b/ext/zend_test/tests/observer_retval_06.phpt
index ffb41aac5981..a20bba5eb2cd 100644
--- a/ext/zend_test/tests/observer_retval_06.phpt
+++ b/ext/zend_test/tests/observer_retval_06.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_CV
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_07.phpt b/ext/zend_test/tests/observer_retval_07.phpt
index 9c9c6246f587..14ce53dae9cd 100644
--- a/ext/zend_test/tests/observer_retval_07.phpt
+++ b/ext/zend_test/tests/observer_retval_07.phpt
@@ -4,6 +4,7 @@ Observer: Retvals are observable that are: IS_REFERENCE, IS_VAR
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_by_ref_01.phpt b/ext/zend_test/tests/observer_retval_by_ref_01.phpt
index 2a7b74de8a75..0d74229ae931 100644
--- a/ext/zend_test/tests/observer_retval_by_ref_01.phpt
+++ b/ext/zend_test/tests/observer_retval_by_ref_01.phpt
@@ -4,6 +4,7 @@ Observer: Retvals by reference are observable that are: IS_CV
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_by_ref_02.phpt b/ext/zend_test/tests/observer_retval_by_ref_02.phpt
index b28dc704e4d6..f1eac5c6051b 100644
--- a/ext/zend_test/tests/observer_retval_by_ref_02.phpt
+++ b/ext/zend_test/tests/observer_retval_by_ref_02.phpt
@@ -4,6 +4,7 @@ Observer: Retvals by reference are observable that are: IS_TMP_VAR
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_retval_by_ref_03.phpt b/ext/zend_test/tests/observer_retval_by_ref_03.phpt
index 9c4cd622e7da..ae4372689c9a 100644
--- a/ext/zend_test/tests/observer_retval_by_ref_03.phpt
+++ b/ext/zend_test/tests/observer_retval_by_ref_03.phpt
@@ -4,6 +4,7 @@ Observer: Retvals by reference are observable that are: IS_VAR, ZEND_RETURNS_FUN
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 opcache.optimization_level=0
diff --git a/ext/zend_test/tests/observer_shutdown_01.phpt b/ext/zend_test/tests/observer_shutdown_01.phpt
index b0ee1bd1a039..81af69bce8e9 100644
--- a/ext/zend_test/tests/observer_shutdown_01.phpt
+++ b/ext/zend_test/tests/observer_shutdown_01.phpt
@@ -4,6 +4,7 @@ Observer: Function calls from a shutdown handler are observable
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_shutdown_02.phpt b/ext/zend_test/tests/observer_shutdown_02.phpt
index f3fbce36dfb8..fbe74bf048a0 100644
--- a/ext/zend_test/tests/observer_shutdown_02.phpt
+++ b/ext/zend_test/tests/observer_shutdown_02.phpt
@@ -4,6 +4,7 @@ Observer: Function calls from a __destruct during shutdown are observable
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_sqlite_create_function.phpt b/ext/zend_test/tests/observer_sqlite_create_function.phpt
index 85d269c9ead1..a31d35651d78 100644
--- a/ext/zend_test/tests/observer_sqlite_create_function.phpt
+++ b/ext/zend_test/tests/observer_sqlite_create_function.phpt
@@ -6,6 +6,7 @@ PDO
 pdo_sqlite
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_types_01.phpt b/ext/zend_test/tests/observer_types_01.phpt
index de03b355ab1e..b39f25f9e58e 100644
--- a/ext/zend_test/tests/observer_types_01.phpt
+++ b/ext/zend_test/tests/observer_types_01.phpt
@@ -4,6 +4,7 @@ Observer: Observe basic TypeError
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 zend_test.observer.show_return_value=1
 --FILE--
diff --git a/ext/zend_test/tests/observer_zend_call_function_01.phpt b/ext/zend_test/tests/observer_zend_call_function_01.phpt
index aed1541f9183..1fa913308a43 100644
--- a/ext/zend_test/tests/observer_zend_call_function_01.phpt
+++ b/ext/zend_test/tests/observer_zend_call_function_01.phpt
@@ -4,6 +4,7 @@ Observer: Calls that go through zend_call_function are observed
 zend_test
 --INI--
 zend_test.observer.enabled=1
+zend_test.observer.show_output=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
diff --git a/run-tests.php b/run-tests.php
index 18bf1b04925f..7d87b48e32e4 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -134,6 +134,10 @@ function show_usage(): void
 
     --bless     Bless failed tests using scripts/dev/bless_tests.php.
 
+    --with-test-observers
+                Run the tests with the zend_test observers registered.
+                This requires the zend_test extension to be enabled.
+
 HELP;
 }
 
@@ -160,7 +164,7 @@ function main(): void
            $temp_source, $temp_target, $test_cnt, $test_dirs,
            $test_files, $test_idx, $test_list, $test_results, $testfile,
            $user_tests, $valgrind, $sum_results, $shuffle, $file_cache, $num_repeats,
-           $bless, $show_progress;
+           $bless, $show_progress, $global_extensions;
     // Parallel testing
     global $workers, $workerID;
     global $context_line_count;
@@ -311,6 +315,7 @@ function main(): void
         'zend.exception_string_param_max_len=15',
         'short_open_tag=0',
     ];
+    $global_extensions = [];
 
     $no_file_cache = '-d opcache.file_cache= -d opcache.file_cache_only=0';
 
@@ -612,6 +617,13 @@ function main(): void
                 case '--version':
                     echo '$Id$' . "\n";
                     exit(1);
+                case '--with-test-observers':
+                    // register zend_test observers but don't actually print any output
+                    $ini_overwrites[] = 'zend_test.observer.enabled=1';
+                    $ini_overwrites[] = 'zend_test.observer.show_output=0';
+                    $ini_overwrites[] = 'zend_test.observer.observe_all=1';
+                    $global_extensions[] = 'zend_test';
+                    break;
 
                 default:
                     echo "Illegal switch '$switch' specified!\n";
@@ -1816,6 +1828,7 @@ function run_test(string $php, $file, array $env): string
     global $slow_min_ms;
     global $preload, $file_cache;
     global $num_repeats;
+    global $global_extensions;
     // Parallel testing
     global $workerID;
     global $show_progress;
@@ -2037,9 +2050,9 @@ function run_test(string $php, $file, array $env): string
     $ini_settings = $workerID ? ['opcache.cache_id' => "worker$workerID"] : [];
 
     // Additional required extensions
-    $extensions = [];
+    $extensions = $global_extensions;
     if ($test->hasSection('EXTENSIONS')) {
-        $extensions = preg_split("/[\n\r]+/", trim($test->getSection('EXTENSIONS')));
+        $extensions = array_merge($extensions, preg_split("/[\n\r]+/", trim($test->getSection('EXTENSIONS'))));
     }
     if (is_array($IN_REDIRECT) && $IN_REDIRECT['EXTENSIONS'] != []) {
         $extensions = array_merge($extensions, $IN_REDIRECT['EXTENSIONS']);