From 3b68dad2122d7e4a87a60f7161b7bc35d7c9b708 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 1 Dec 2020 09:47:51 +0100 Subject: In tests, don't `die("skip")` but `print "skip"` instead (#358) This is required since the `die` is making php8 choke--- src/tests/broken_configuration/broken_conf_invalid_filename.phpt | 2 +- src/tests/broken_configuration/broken_conf_invalid_log_media.phpt | 2 +- src/tests/broken_configuration/broken_conf_invalid_type.phpt | 2 +- src/tests/broken_configuration/broken_conf_wrong_type.phpt | 4 ++-- src/tests/broken_configuration/broken_invalid_client_ip4.phpt | 2 +- src/tests/broken_configuration/broken_regexp.phpt | 2 +- src/tests/broken_configuration/broken_unmatching_brackets.phpt | 2 +- src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/tests/broken_configuration') diff --git a/src/tests/broken_configuration/broken_conf_invalid_filename.phpt b/src/tests/broken_configuration/broken_conf_invalid_filename.phpt index aed30c8..8f4c501 100644 --- a/src/tests/broken_configuration/broken_conf_invalid_filename.phpt +++ b/src/tests/broken_configuration/broken_conf_invalid_filename.phpt @@ -1,7 +1,7 @@ --TEST-- Broken configuration filename without absolute path --SKIPIF-- - + --INI-- sp.configuration_file={PWD}/config/broken_conf_invalid_filename.ini --FILE-- diff --git a/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt b/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt index 9c516bc..bc048b3 100644 --- a/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt +++ b/src/tests/broken_configuration/broken_conf_invalid_log_media.phpt @@ -1,7 +1,7 @@ --TEST-- Broken configuration filename with improper log media --SKIPIF-- - + --INI-- sp.configuration_file={PWD}/config/broken_conf_invalid_log_media.ini --FILE-- diff --git a/src/tests/broken_configuration/broken_conf_invalid_type.phpt b/src/tests/broken_configuration/broken_conf_invalid_type.phpt index f5b0ce5..b73cdd0 100644 --- a/src/tests/broken_configuration/broken_conf_invalid_type.phpt +++ b/src/tests/broken_configuration/broken_conf_invalid_type.phpt @@ -1,7 +1,7 @@ --TEST-- Broken conf with wrong type --SKIPIF-- - + --INI-- sp.configuration_file={PWD}/config/broken_conf_invalid_type.ini --FILE-- diff --git a/src/tests/broken_configuration/broken_conf_wrong_type.phpt b/src/tests/broken_configuration/broken_conf_wrong_type.phpt index 150cda0..32e8499 100644 --- a/src/tests/broken_configuration/broken_conf_wrong_type.phpt +++ b/src/tests/broken_configuration/broken_conf_wrong_type.phpt @@ -1,7 +1,7 @@ --TEST-- Broken conf with wrong type --SKIPIF-- - + --INI-- sp.configuration_file={PWD}/config/broken_conf_wrong_type.ini --FILE-- @@ -11,4 +11,4 @@ PHP Fatal error: [snuffleupagus][0.0.0.0][error][log] .ret_type() is expecting Fatal error: [snuffleupagus][0.0.0.0][error][log] .ret_type() is expecting a valid php type ('false', 'true', 'array'. 'object', 'long', 'double', 'null', 'resource', 'reference', 'undef') on line 5 in Unknown on line 0 Fatal error: [snuffleupagus][0.0.0.0][config][log] Invalid configuration file in Unknown on line 0 -Could not startup. \ No newline at end of file +Could not startup. diff --git a/src/tests/broken_configuration/broken_invalid_client_ip4.phpt b/src/tests/broken_configuration/broken_invalid_client_ip4.phpt index cbc17e7..a96b059 100644 --- a/src/tests/broken_configuration/broken_invalid_client_ip4.phpt +++ b/src/tests/broken_configuration/broken_invalid_client_ip4.phpt @@ -1,7 +1,7 @@ --TEST-- Invalid client IP --SKIPIF-- - + --ENV-- return << + --INI-- sp.configuration_file={PWD}/config/broken_regexp.ini --FILE-- diff --git a/src/tests/broken_configuration/broken_unmatching_brackets.phpt b/src/tests/broken_configuration/broken_unmatching_brackets.phpt index bba8e0c..46c81f9 100644 --- a/src/tests/broken_configuration/broken_unmatching_brackets.phpt +++ b/src/tests/broken_configuration/broken_unmatching_brackets.phpt @@ -1,7 +1,7 @@ --TEST-- Broken configuration - unmatching brackets --SKIPIF-- - + --INI-- sp.configuration_file={PWD}/config/config_unmatching_brackets.ini --FILE-- diff --git a/src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt b/src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt index 0b98e73..7a8c909 100644 --- a/src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt +++ b/src/tests/broken_configuration/encrypt_regexp_cookies_bad_regexp.phpt @@ -1,7 +1,7 @@ --TEST-- Cookie decryption in ipv4 --SKIPIF-- - + --INI-- sp.configuration_file={PWD}/config/config_encrypted_regexp_cookies_bad_regexp.ini error_reporting=1 -- cgit v1.3