From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 1 Jul 2019 14:41:20 +0000 (+0200)
Subject: Fix brittle test
X-Git-Tag: php-7.2.21RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be559e6c37e0618c5e3429c3bfd5223840d3654c;p=php

Fix brittle test

This test is easily tripped by former test runs with other PHP
versions.  To avoid such false positives, we check that there is at
least one respective OPcache file, and that all found OPcache user ID
folders have exactly 32 hexadecimal digits.
---

diff --git a/ext/opcache/tests/bug78189.phpt b/ext/opcache/tests/bug78189.phpt
index 49891c8d63..d97d8e9470 100644
--- a/ext/opcache/tests/bug78189.phpt
+++ b/ext/opcache/tests/bug78189.phpt
@@ -14,9 +14,16 @@ opcache.file_cache_only=1
 <?php
 $tmpdir = sys_get_temp_dir();
 $pattern = $tmpdir . '/*/*/' . str_replace(':', '', __DIR__) . '/bug78189.php.bin';
-foreach (glob($pattern) as $filename) {
-    var_dump(preg_match('~/[0-9a-f]{32}/~', substr($filename, strlen($tmpdir), 34)));
+$filenames = glob($pattern);
+if (count($filenames)) {
+    foreach ($filenames as $filename) {
+        $part = substr($filename, strlen($tmpdir), 34);
+        if (!preg_match('~/[0-9a-f]{32}/~', $part)) {
+            echo "invalid opcache folder: $part\n";
+        }
+    }
+} else {
+    echo "no opcache file found!\n";
 }
 ?>
 --EXPECT--
-int(1)