From: Anatol Belski <ab@php.net>
Date: Wed, 12 Sep 2018 20:27:30 +0000 (+0200)
Subject: Show all unmatched errors when test failed
X-Git-Tag: php-7.4.0alpha1~1941
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70159652541c62b5f3bbb26da76b7e56987b2544;p=php

Show all unmatched errors when test failed
---

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";
+		}
 	}
     }
 }