13 files changed, 27 insertions, 2 deletions

diff --git a/.travis.yml b/.travis.yml
index 4e2ec64..f5a8fee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,8 @@ script:
   - phpize
   - ./configure --enable-snuffleupagus --enable-coverage
   - make -j 2
+  - sed -i "s/\$ext_params -d display_errors=0 -r/-d display_errors=0 -r/" run-tests.php
+  - cat run-tests.php
   - TEST_PHP_ARGS="-q" REPORT_EXIT_STATUS=1 make test
 
 after_success:
diff --git a/Makefile b/Makefile
index c0d65c2..db5878e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ compile_debug:  ## compile a debug build
         make -C src
 
 debug: compile_debug ## compile and run a debug build
+        sed -i "s/\$$ext_params -d display_errors=0 -r/-d display_errors=0 -r/" src/run-tests.php
         TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make -C src test
 
 coverage:  ## compile snuffleugpaus, and run the testsuite with coverage
diff --git a/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt
index 1d51b05..dc53593 100644
--- a/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs.phpt
@@ -5,6 +5,8 @@ Disable functions - Ensure that client certificates validation can't be disabled
 if (!extension_loaded("snuffleupagus")) { die("skip"); }
 if (!extension_loaded("curl")) { die("skip"); }
 ?>
+--EXTENSIONS--
+curl
 --INI--
 sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini
 --FILE--
diff --git a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt
index a79ff48..9ff37ec 100644
--- a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_multi_setopt.phpt
@@ -5,6 +5,8 @@ Disable functions - Ensure that client certificates validation can't be disabled
 if (!extension_loaded("snuffleupagus")) { die("skip"); }
 if (!extension_loaded("curl")) { die("skip"); }
 ?>
+--EXTENSIONS--
+curl
 --INI--
 sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini
 --FILE--
diff --git a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt
index 6c7bc93..246fee6 100644
--- a/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_client_valid_certs_curl_setopt_array.phpt
@@ -5,6 +5,8 @@ Disable functions - Ensure that client certificates validation can't be disabled
 if (!extension_loaded("snuffleupagus")) { die("skip"); }
 if (!extension_loaded("curl")) { die("skip"); }
 ?>
+--EXTENSIONS--
+curl
 --INI--
 sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini
 --FILE--
diff --git a/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt
index 40b58cc..fa583b0 100644
--- a/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs.phpt
@@ -5,6 +5,8 @@ Disable functions - Ensure that server certificates validation can't be disabled
 if (!extension_loaded("snuffleupagus")) { die("skip"); }
 if (!extension_loaded("curl")) { die("skip"); }
 ?>
+--EXTENSIONS--
+curl
 --INI--
 sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini
 --FILE--
diff --git a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt
index 06acd6c..3b374ee 100644
--- a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_multi_setopt.phpt
@@ -5,6 +5,8 @@ Disable functions - Ensure that server certificates validation can't be disabled
 if (!extension_loaded("snuffleupagus")) { die("skip"); }
 if (!extension_loaded("curl")) { die("skip"); }
 ?>
+--EXTENSIONS--
+curl
 --INI--
 sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini
 --FILE--
diff --git a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt
index c716625..97accce 100644
--- a/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt
+++ b/src/tests/disable_function/disabled_function_ensure_server_valid_certs_curl_setopt_array.phpt
@@ -2,9 +2,11 @@
 Disable functions - Ensure that server certificates validation can't be disabled via `curl_setopt_array`
 --SKIPIF--
 <?php
-if (!extension_loaded("snuffleupagus")) { die("skip"); }
-if (!extension_loaded("curl")) { die("skip"); }
+if (!extension_loaded("snuffleupagus")) { echo("skip"); }
+if (!extension_loaded("curl")) { echo("skip"); }
 ?>
+--EXTENSIONS--
+curl
 --INI--
 sp.configuration_file={PWD}/config/disabled_function_curl_verify_certs.ini
 --FILE--
diff --git a/src/tests/xxe/disable_xxe_dom.phpt b/src/tests/xxe/disable_xxe_dom.phpt
index e1459e3..2f45f66 100644
--- a/src/tests/xxe/disable_xxe_dom.phpt
+++ b/src/tests/xxe/disable_xxe_dom.phpt
@@ -8,6 +8,8 @@ Disable XXE
         echo "skip";
 }
  ?>
+--EXTENSIONS--
+dom
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
 --FILE--
diff --git a/src/tests/xxe/disable_xxe_dom_disabled.phpt b/src/tests/xxe/disable_xxe_dom_disabled.phpt
index a791ebc..59526d2 100644
--- a/src/tests/xxe/disable_xxe_dom_disabled.phpt
+++ b/src/tests/xxe/disable_xxe_dom_disabled.phpt
@@ -5,6 +5,8 @@ Disable XXE
  if (!extension_loaded("snuffleupagus")) echo "skip";
  if (!extension_loaded("dom")) echo "skip";
  ?>
+--extensions--
+dom
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe_disable.ini
 --FILE--
diff --git a/src/tests/xxe/disable_xxe_simplexml.phpt b/src/tests/xxe/disable_xxe_simplexml.phpt
index 88396c0..35d79de 100644
--- a/src/tests/xxe/disable_xxe_simplexml.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml.phpt
@@ -5,6 +5,8 @@ Disable XXE
  if (!extension_loaded("snuffleupagus")) echo "skip";
  if (!extension_loaded("simplexml")) echo "skip";
  ?>
+--EXTENSIONS--
+xml
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
 --FILE--
diff --git a/src/tests/xxe/disable_xxe_simplexml_oop.phpt b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
index 43c4fbf..33c3bb5 100644
--- a/src/tests/xxe/disable_xxe_simplexml_oop.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
@@ -5,6 +5,8 @@ Disable XXE
  if (!extension_loaded("snuffleupagus")) echo "skip";
  if (!extension_loaded("simplexml")) echo "skip";
  ?>
+--EXTENSIONS--
+xml
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
 --FILE--
diff --git a/src/tests/xxe/disable_xxe_xml_parse.phpt b/src/tests/xxe/disable_xxe_xml_parse.phpt
index ca77729..b6dec2d 100644
--- a/src/tests/xxe/disable_xxe_xml_parse.phpt
+++ b/src/tests/xxe/disable_xxe_xml_parse.phpt
@@ -8,6 +8,8 @@ Disable XXE in xml_parse
   echo "skip because the `xml` extension isn't loaded";
 }
  ?>
+--EXTENSIONS--
+xml
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
 --FILE--