Improve create_verify_dir() diagnostics

cmb69 · cmb69 · commit e58e2fd0d49c · 2019-06-17T16:49:52.000+02:00
If create_verify_dir() fails[1], we need more info why that happened. [1] <https://ci.appveyor.com/project/cmb69/php-src/builds/25324138/job/dm1n12gqhdqa3ln5#L5753>
diff --git a/ext/standard/tests/file/windows_mb_path/util.inc b/ext/standard/tests/file/windows_mb_path/util.inc
@@ -94,8 +94,14 @@ function create_verify_dir($prefix, $basename, $cp = 65001)
 {
 	$full = $prefix . DIRECTORY_SEPARATOR . $basename;
 
-	if (!mkdir($full) || get_basename_with_cp($full, $cp, false) !== $basename) {
+	if (!mkdir($full)) {
 		echo "failed to create dir '$full'\n";
+		return;
+	}
+
+	$now = get_basename_with_cp($full, $cp, false);
+	if ($now !== $basename) {
+		echo "expected '$basename', got '$now'\n";
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,14 @@ function create_verify_dir($prefix, $basename, $cp = 65001)`
`94`	`94`	`{`
`95`	`95`	`$full = $prefix . DIRECTORY_SEPARATOR . $basename;`
`96`	`96`
`97`		`- if (!mkdir($full) \|\| get_basename_with_cp($full, $cp, false) !== $basename) {`
	`97`	`+ if (!mkdir($full)) {`
`98`	`98`	`echo "failed to create dir '$full'\n";`
	`99`	`+ return;`
	`100`	`+ }`
	`101`	`+`
	`102`	`+ $now = get_basename_with_cp($full, $cp, false);`
	`103`	`+ if ($now !== $basename) {`
	`104`	`+ echo "expected '$basename', got '$now'\n";`
`99`	`105`	`}`
`100`	`106`	`}`
`101`	`107`