From cc4c313886bf63cb8c5a3ff260c468c8fcfe34c7 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 21 Feb 2019 15:29:22 +0100
Subject: [PATCH] Make (v)fprintf tests more robust

By using a separate file for each test. Also drop some unnecessary
SKIPIF checks for file creation. We assume that files can be created in
the test directories all over the place, so don't check for it here.
---
 .../tests/strings/fprintf_variation_001.phpt  |   9 +-------
 .../tests/strings/fprintf_variation_002.phpt  |   9 +-------
 .../tests/strings/fprintf_variation_003.phpt  |   6 +-----
 .../strings/fprintf_variation_003_64bit.phpt  |   6 +-----
 .../tests/strings/fprintf_variation_004.phpt  | Bin 734 -> 594 bytes
 .../tests/strings/fprintf_variation_005.phpt  |   9 +-------
 .../tests/strings/fprintf_variation_006.phpt  |   6 +-----
 .../strings/fprintf_variation_006_64bit.phpt  |   6 +-----
 .../tests/strings/fprintf_variation_007.phpt  |   6 +-----
 .../strings/fprintf_variation_007_64bit.phpt  |   6 +-----
 .../tests/strings/fprintf_variation_008.phpt  |   6 +-----
 .../strings/fprintf_variation_008_64bit.phpt  |   6 +-----
 .../tests/strings/fprintf_variation_009.phpt  |   9 +-------
 ext/standard/tests/strings/md5_file.phpt      | Bin 2846 -> 2876 bytes
 ext/standard/tests/strings/sha1_file.phpt     |  20 +++++++++---------
 .../tests/strings/vfprintf_basic.phpt         |   4 ++--
 .../tests/strings/vfprintf_error1.phpt        |   4 ++--
 .../tests/strings/vfprintf_error2.phpt        |   4 ++--
 .../tests/strings/vfprintf_error3.phpt        |   4 ++--
 .../tests/strings/vfprintf_error4.phpt        |   4 ++--
 .../tests/strings/vfprintf_variation1.phpt    |   4 ++--
 21 files changed, 34 insertions(+), 94 deletions(-)

diff --git a/ext/standard/tests/strings/fprintf_variation_001.phpt b/ext/standard/tests/strings/fprintf_variation_001.phpt
index 3a935107a7c8d..df81c249b63fc 100644
--- a/ext/standard/tests/strings/fprintf_variation_001.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_001.phpt
@@ -1,12 +1,5 @@
 --TEST--
 Test fprintf() function (variation - 1)
---SKIPIF--
-<?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
-?>
 --FILE--
 <?php
 
@@ -14,7 +7,7 @@ $float_variation = array( "%f","%-f", "%+f", "%7.2f", "%-7.2f", "%07.2f", "%-07.
 $float_numbers = array( 0, 1, -1, 0.32, -0.32, 3.4. -3.4, 2.54, -2.54 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_001.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_002.phpt b/ext/standard/tests/strings/fprintf_variation_002.phpt
index 49e62e2b7445d..1cc1a4ddd7edf 100644
--- a/ext/standard/tests/strings/fprintf_variation_002.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_002.phpt
@@ -1,12 +1,5 @@
 --TEST--
 Test fprintf() function (variation - 2)
---SKIPIF--
-<?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
-?>
 --FILE--
 <?php
 
@@ -14,7 +7,7 @@ $int_variation = array( "%d", "%-d", "%+d", "%7.2d", "%-7.2d", "%07.2d", "%-07.2
 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_002.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_003.phpt b/ext/standard/tests/strings/fprintf_variation_003.phpt
index b4860879b06fd..1e8eb4706f2b8 100644
--- a/ext/standard/tests/strings/fprintf_variation_003.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_003.phpt
@@ -2,10 +2,6 @@
 Test fprintf() function (variation - 3)
 --SKIPIF--
 <?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
@@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_003.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt
index ba8e525c3f0f8..26db7ab18ba29 100644
--- a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt
@@ -2,10 +2,6 @@
 Test fprintf() function (variation - 3)
 --SKIPIF--
 <?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
@@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_003_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_004.phpt b/ext/standard/tests/strings/fprintf_variation_004.phpt
index 5502b6d7c09d418004d89ec40bc7782abca3636e..aa47a298d8fc4e6070e5303a0562f4aec913aff0 100644
GIT binary patch
delta 39
vcmcb|dWmI%@x%)aqG<(1nRz8?@nwlcnTaKt`FZgM1|}0T)i+l&CNly6NtF*j

delta 106
zcmcb_a*uU_F<-E^XMm@ht}d62eL+US#C{c)l+xUSi6_);)ipIW6{@)u6jCx%HPnl<
zGYb^lGILTDK=OJe6(tJE`K3823VHb@3Q4I7$wjG&C8;Uun$}#kT=sSo4Vu9QZ9LJ%
F2mmD3BNzYx

diff --git a/ext/standard/tests/strings/fprintf_variation_005.phpt b/ext/standard/tests/strings/fprintf_variation_005.phpt
index 0967b77cd8ccb..0be2cb68476dc 100644
--- a/ext/standard/tests/strings/fprintf_variation_005.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_005.phpt
@@ -1,19 +1,12 @@
 --TEST--
 Test fprintf() function (variation - 5)
---SKIPIF--
-<?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
-?>
 --FILE--
 <?php
 
 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_005.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_006.phpt b/ext/standard/tests/strings/fprintf_variation_006.phpt
index 8a66fb9fb4c05..b48720c2d55fc 100644
--- a/ext/standard/tests/strings/fprintf_variation_006.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_006.phpt
@@ -2,10 +2,6 @@
 Test fprintf() function (variation - 6)
 --SKIPIF--
 <?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
@@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_006.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt
index fe4cc91dd71d6..92ab010d030ad 100644
--- a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt
@@ -2,10 +2,6 @@
 Test fprintf() function (variation - 6)
 --SKIPIF--
 <?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
@@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_006_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_007.phpt b/ext/standard/tests/strings/fprintf_variation_007.phpt
index 16d39bbde327e..f2653a1ee1420 100644
--- a/ext/standard/tests/strings/fprintf_variation_007.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_007.phpt
@@ -2,10 +2,6 @@
 Test fprintf() function (variation - 7)
 --SKIPIF--
 <?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
@@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_007.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt
index 55cd946a3b71f..9e30f9163999e 100644
--- a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt
@@ -2,10 +2,6 @@
 Test fprintf() function (variation - 7)
 --SKIPIF--
 <?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
@@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_007_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_008.phpt b/ext/standard/tests/strings/fprintf_variation_008.phpt
index d2187c7ccdee4..e8c0a9e412708 100644
--- a/ext/standard/tests/strings/fprintf_variation_008.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_008.phpt
@@ -2,10 +2,6 @@
 Test fprintf() function (variation - 8)
 --SKIPIF--
 <?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
 if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
 ?>
 --FILE--
@@ -15,7 +11,7 @@ $int_variation = array( "%d", "%-d", "%+d", "%7.2d", "%-7.2d", "%07.2d", "%-07.2
 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_008.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt
index 9d326a91c11c0..661f2711f322e 100644
--- a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt
@@ -2,10 +2,6 @@
 Test fprintf() function (variation - 8)
 --SKIPIF--
 <?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
 if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
 ?>
 --FILE--
@@ -15,7 +11,7 @@ $int_variation = array( "%d", "%-d", "%+d", "%7.2d", "%-7.2d", "%07.2d", "%-07.2
 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_008_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/fprintf_variation_009.phpt b/ext/standard/tests/strings/fprintf_variation_009.phpt
index e36c0e8c0f2aa..c16623ba8fe3e 100644
--- a/ext/standard/tests/strings/fprintf_variation_009.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_009.phpt
@@ -1,12 +1,5 @@
 --TEST--
 Test fprintf() function (variation - 9)
---SKIPIF--
-<?php
-$data_file = dirname(__FILE__) . '/dump.txt';
-if (!($fp = fopen($data_file, 'w'))) {
-  die('skip File dump.txt could not be created');
-}
-?>
 --FILE--
 <?php
 
@@ -14,7 +7,7 @@ $string_variation = array( "%5s", "%-5s", "%05s", "%'#5s" );
 $strings = array( NULL, "abc", 'aaa' );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/fprintf_variation_009.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt
index 3e996eccd37737ee691486ff5c3cb8c0f495b1da..45009669f4ac4f75038c23163d7c230fe878de30 100644
GIT binary patch
delta 113
zcmbOywnuD(I3u&Ki|OP_My<(?j22LK2#DT%mT?vnSRkEcIhf{Soe8FwvqJcOYzx5r
qcWh?zKn;2&6(vfV)?B4|IhlFc8cMFY1tpbknK`K-!))0fG6Mi$RU&l&

delta 53
zcmdlZHcxDWIOF7cMy<&%j21vTWb-w~Sxl3QS(Z<hWt};BC+qUb$!rTIv$2~^wr7{z
J9L@fa836e{5`6#w

diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt
index 83a191b172b0e..102dab75ff6f9 100644
--- a/ext/standard/tests/strings/sha1_file.phpt
+++ b/ext/standard/tests/strings/sha1_file.phpt
@@ -10,15 +10,15 @@ Test sha1_file() function with ASCII output and raw binary output. Based on ext/
 echo "*** Testing sha1_file() : basic functionality ***\n";
 
 /* Creating an empty file */
-if (($handle = fopen( "EmptyFile.txt", "w+")) == FALSE)
+if (($handle = fopen( "EmptyFileSHA1.txt", "w+")) == FALSE)
 return false;
 
 /* Creating a data file */
-if (($handle2 = fopen( "DataFile.txt", "w+")) == FALSE)
+if (($handle2 = fopen( "DataFileSHA1.txt", "w+")) == FALSE)
 return false;
 
 /* Writing into file */
-$filename = "DataFile.txt";
+$filename = "DataFileSHA1.txt";
 $content = "Add this to the file\n";
 if (is_writable($filename)) {
   if (fwrite($handle2, $content) === FALSE) {
@@ -50,23 +50,23 @@ echo "\n-- Zero arguments --\n";
  var_dump ( sha1_file() );
 
 echo "\n-- More than valid number of arguments ( valid is 2) --\n";
-var_dump ( sha1_file("EmptyFile.txt", true, NULL) );
+var_dump ( sha1_file("EmptyFileSHA1.txt", true, NULL) );
 
 echo "\n-- Hexadecimal Output for Empty file as Argument --\n";
-var_dump( sha1_file("EmptyFile.txt") );
+var_dump( sha1_file("EmptyFileSHA1.txt") );
 
 echo "\n-- Raw Binary Output for Empty file as Argument --\n";
-var_dump( bin2hex(sha1_file("EmptyFile.txt", true)));
+var_dump( bin2hex(sha1_file("EmptyFileSHA1.txt", true)));
 
 echo "\n-- Hexadecimal Output for a valid file with some contents --\n";
-var_dump( sha1_file("DataFile.txt") );
+var_dump( sha1_file("DataFileSHA1.txt") );
 
 echo "\n-- Raw Binary Output for a valid file with some contents --\n";
-var_dump ( bin2hex(sha1_file("DataFile.txt", true)));
+var_dump ( bin2hex(sha1_file("DataFileSHA1.txt", true)));
 
 // remove temp files
-unlink("DataFile.txt");
-unlink("EmptyFile.txt");
+unlink("DataFileSHA1.txt");
+unlink("EmptyFileSHA1.txt");
 
 ?>
 ===DONE===
diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt
index 2843e33af50fa..30cd5348bf110 100644
--- a/ext/standard/tests/strings/vfprintf_basic.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic.phpt
@@ -25,7 +25,7 @@ function writeAndDump($fp, $format, $args)
 echo "*** Testing vfprintf() : basic functionality ***\n";
 
 // Open handle
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_basic.txt';
 $fp = fopen( $file, "a+" );
 
 // Test vfprintf()
@@ -46,7 +46,7 @@ fclose( $fp );
 --CLEAN--
 <?php
 
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_basic.txt';
 unlink( $file );
 
 ?>
diff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt
index c3c869bb4dd96..c56631ecd7e9c 100644
--- a/ext/standard/tests/strings/vfprintf_error1.phpt
+++ b/ext/standard/tests/strings/vfprintf_error1.phpt
@@ -13,7 +13,7 @@ precision=14
  */
 
 // Open handle
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_error1.txt';
 $fp = fopen( $file, "a+" );
 
 echo "\n-- Testing vfprintf() function with more than expected no. of arguments --\n";
@@ -31,7 +31,7 @@ fclose($fp);
 --CLEAN--
 <?php
 
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_error1.txt';
 unlink( $file );
 
 ?>
diff --git a/ext/standard/tests/strings/vfprintf_error2.phpt b/ext/standard/tests/strings/vfprintf_error2.phpt
index 1eb89694ec9f6..7da28468b3a37 100644
--- a/ext/standard/tests/strings/vfprintf_error2.phpt
+++ b/ext/standard/tests/strings/vfprintf_error2.phpt
@@ -13,7 +13,7 @@ precision=14
  */
 
 // Open handle
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_error2.txt';
 $fp = fopen( $file, "a+" );
 
 echo "\n-- Testing vfprintf() function with less than expected no. of arguments --\n";
@@ -30,7 +30,7 @@ fclose($fp);
 --CLEAN--
 <?php
 
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_error2.txt';
 unlink( $file );
 
 ?>
diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt
index dbc0d08897c9b..8be51e1798d05 100644
--- a/ext/standard/tests/strings/vfprintf_error3.phpt
+++ b/ext/standard/tests/strings/vfprintf_error3.phpt
@@ -13,7 +13,7 @@ precision=14
  */
 
 // Open handle
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_error3.txt';
 $fp = fopen( $file, "a+" );
 
 echo "\n-- Testing vfprintf() function with wrong variable types as argument --\n";
@@ -39,7 +39,7 @@ fclose( $fp );
 --CLEAN--
 <?php
 
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_error3.txt';
 unlink( $file );
 
 ?>
diff --git a/ext/standard/tests/strings/vfprintf_error4.phpt b/ext/standard/tests/strings/vfprintf_error4.phpt
index 589d82c3d6002..2865d42a9e655 100644
--- a/ext/standard/tests/strings/vfprintf_error4.phpt
+++ b/ext/standard/tests/strings/vfprintf_error4.phpt
@@ -13,7 +13,7 @@ precision=14
  */
 
 // Open handle
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_error4.txt';
 $fp = fopen( $file, "a+" );
 
 echo "\n-- Testing vfprintf() function with other strangeties  --\n";
@@ -28,7 +28,7 @@ fclose( $fp );
 --CLEAN--
 <?php
 
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_error4.txt';
 unlink( $file );
 
 ?>
diff --git a/ext/standard/tests/strings/vfprintf_variation1.phpt b/ext/standard/tests/strings/vfprintf_variation1.phpt
index 6358bccd1c58d..76422011c2fc3 100644
--- a/ext/standard/tests/strings/vfprintf_variation1.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation1.phpt
@@ -15,7 +15,7 @@ precision=14
 echo "*** Testing vfprintf() : variation functionality ***\n";
 
 // Open handle
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_variation1.txt';
 $fp = fopen( $file, 'a+' );
 
 $funset = fopen( __FILE__, 'r' );
@@ -59,7 +59,7 @@ fclose( $fp );
 --CLEAN--
 <?php
 
-$file = 'vfprintf_test.txt';
+$file = 'vfprintf_variation1.txt';
 unlink( $file );
 
 ?>