From 70159652541c62b5f3bbb26da76b7e56987b2544 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 12 Sep 2018 22:27:30 +0200 Subject: [PATCH] Show all unmatched errors when test failed --- ext/openssl/tests/openssl_error_string_basic.phpt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt index 4623c3d384..cdf558e9a5 100644 --- a/ext/openssl/tests/openssl_error_string_basic.phpt +++ b/ext/openssl/tests/openssl_error_string_basic.phpt @@ -7,15 +7,16 @@ openssl_error_string() tests // helper function to check openssl errors function expect_openssl_errors($name, $expected_error_codes) { $expected_errors = array_fill_keys($expected_error_codes, false); - $unexpected_errors = array(); + $all_errors = array(); while (($error_string = openssl_error_string()) !== false) { if (preg_match(",.+:([0-9A-F]+):.+,", $error_string, $m) > 0) { $error_code = $m[1]; if (isset($expected_errors[$error_code])) { $expected_errors[$error_code] = true; } + $all_errors[$error_code] = $error_string; } else { - $unexpected_errors[] = $error_string; + $all_errors[] = $error_string; } } @@ -30,9 +31,11 @@ function expect_openssl_errors($name, $expected_error_codes) { if (!$fail) { echo "$name: ok\n"; } else { - echo "$name: unexpected errors\n"; - foreach ($unexpected_errors as $e) { - echo "'$e'\n"; + echo "$name: uncaught errors\n"; + foreach ($all_errors as $code => $str) { + if (!isset($expected_errors[$code]) || !$expected_errors[$code]) { + echo "\t", $code, ": ", $str, "\n"; + } } } } -- 2.50.1