Merge branch 'PHP-7.4'

* PHP-7.4: Properly clean up test case
bagder · Feb 22, 2019 · a848ed3 · a848ed3
2 parents 258c7fb + f319419
commit a848ed3
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt
@@ -24,9 +24,11 @@ for ($i = 0; $i < $how_many; $i++) {
 }
 
 $start = realpath(dirname(__FILE__));
+$newstart = false;
 if (strlen($start) <= 248) {
 	// create the exact length
 	$start = $start . "\\" . str_repeat('a', 251 - strlen($start) - 1);
+	$newstart = true;
 }
 
 var_dump($start);
@@ -47,6 +49,9 @@ for ($i = 0; $i < $how_many; $i++) {
 	$p0 = substr($p, 0, strlen($p) - $i*51);
 	rmdir($p0);
 }
+if ($newstart) {
+	rmdir($start);
+}
 
 ?>
 ===DONE===