Try to fix more windows tests

nikic · nikic · commit 80ec0728da91 · 2021-02-11T16:42:43.000+01:00
diff --git a/ext/readline/tests/libedit_write_history_001-win32.phpt b/ext/readline/tests/libedit_write_history_001-win32.phpt
@@ -15,7 +15,6 @@ $name = tempnam(sys_get_temp_dir(), 'readline.tmp');
 readline_add_history('foo');
 readline_add_history('');
 readline_add_history(1);
-readline_add_history(NULL);
 readline_write_history($name);
 
 var_dump(file_get_contents($name));
diff --git a/ext/standard/tests/file/005_variation2-win32.phpt b/ext/standard/tests/file/005_variation2-win32.phpt
@@ -32,8 +32,7 @@ stat_fn(false);
 stat_fn('');
 stat_fn(' ');
 stat_fn('|');
-echo "\n*** testing touch ***";
-var_dump(touch(NULL));
+echo "\n*** testing touch ***\n";
 var_dump(touch(false));
 var_dump(touch(''));
 
@@ -80,7 +79,7 @@ Warning: filemtime(): stat failed for | in %s on line %d
 Warning: filectime(): stat failed for | in %s on line %d
 
 
-*** testing touch ***bool(false)
+*** testing touch ***
 bool(false)
 bool(false)
 
diff --git a/ext/standard/tests/file/basename-win32.phpt b/ext/standard/tests/file/basename-win32.phpt
@@ -205,7 +205,7 @@ string(3) "bar"
 string(3) "bar"
 
 --Iteration 5--
-string(3) "bar"
+string(7) "bar.tar"
 
 --Iteration 6--
 string(7) "bar.tar"
@@ -220,10 +220,10 @@ string(7) "bar.tar"
 string(7) "bar.tar"
 
 --Iteration 10--
-string(7) "bar.tar"
+string(4) "10.5"
 
 --Iteration 11--
-string(7) "bar.tar"
+string(2) "10"
 
 --Iteration 12--
 string(4) "10.5"
@@ -232,37 +232,37 @@ string(4) "10.5"
 string(2) "10"
 
 --Iteration 14--
-string(4) "10.5"
+string(2) "10"
 
 --Iteration 15--
-string(2) "10"
+string(4) "10.5"
 
 --Iteration 16--
-string(2) "10"
+string(4) "10.5"
 
 --Iteration 17--
-string(4) "10.5"
+string(6) "10.zip"
 
 --Iteration 18--
-string(4) "10.5"
+string(1) "0"
 
 --Iteration 19--
-string(6) "10.zip"
+string(1) "0"
 
 --Iteration 20--
-string(1) "0"
+string(7) "bar.zip"
 
 --Iteration 21--
-string(1) "0"
+string(7) "bar.zip"
 
 --Iteration 22--
 string(7) "bar.zip"
 
 --Iteration 23--
-string(7) "bar.zip"
+string(1) " "
 
 --Iteration 24--
-string(7) "bar.zip"
+string(1) " "
 
 --Iteration 25--
 string(1) " "
@@ -274,14 +274,5 @@ string(1) " "
 string(0) ""
 
 --Iteration 28--
-string(1) " "
-
---Iteration 29--
-string(1) " "
-
---Iteration 30--
-string(0) ""
-
---Iteration 31--
 string(0) ""
 Done
diff --git a/ext/standard/tests/file/realpath_variation-win32-mb.phpt b/ext/standard/tests/file/realpath_variation-win32-mb.phpt
@@ -51,8 +51,6 @@ $file_string = array (
   /* empty filename */
   "",
   '',
-  NULL,
-  null
  );
 for($loop_counter = 0; $loop_counter < count($file_string); $loop_counter++) {
   echo "-- Iteration";
@@ -91,8 +89,4 @@ bool(false)
 string(%d) "%s"
 -- Iteration4 --
 string(%d) "%s"
--- Iteration5 --
-string(%d) "%s"
--- Iteration6 --
-string(%d) "%s"
 Done
