From: ptarjan <ptarjan@fb.com>
Date: Thu, 26 Sep 2013 07:18:05 +0000 (-0700)
Subject: fix many parallel test issues
X-Git-Tag: php-5.6.0alpha1~211^2~51^2~4^2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecbe4af0de94c629fa5ba8ab169654e00c958bad;p=php

fix many parallel test issues

While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
---

diff --git a/ext/ftp/tests/ftp_fget_basic1.phpt b/ext/ftp/tests/ftp_fget_basic1.phpt
index 475f7183d2..5909d35cef 100644
--- a/ext/ftp/tests/ftp_fget_basic1.phpt
+++ b/ext/ftp/tests/ftp_fget_basic1.phpt
@@ -16,7 +16,7 @@ ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");
 ftp_set_option($ftp, FTP_AUTOSEEK, false);
 
-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic1.txt";
 $handle = fopen($local_file, 'w');
 
 var_dump(ftp_fget($ftp, $handle, 'fget.txt', FTP_ASCII, FTP_AUTORESUME));
@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic1.txt");
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/ftp/tests/ftp_fget_basic2.phpt b/ext/ftp/tests/ftp_fget_basic2.phpt
index 00a26752d9..622cea3683 100644
--- a/ext/ftp/tests/ftp_fget_basic2.phpt
+++ b/ext/ftp/tests/ftp_fget_basic2.phpt
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
 ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");
 
-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic2.txt";
 file_put_contents($local_file, 'ASCIIFoo');
 $handle = fopen($local_file, 'a');
 
@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic2.txt");
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/ftp/tests/ftp_fget_basic3.phpt b/ext/ftp/tests/ftp_fget_basic3.phpt
index b7098701ab..9485473b1c 100644
--- a/ext/ftp/tests/ftp_fget_basic3.phpt
+++ b/ext/ftp/tests/ftp_fget_basic3.phpt
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
 ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");
 
-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic3.txt";
 file_put_contents($local_file, 'ASCIIFoo');
 $handle = fopen($local_file, 'a');
 
@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_fget_basic3.txt");
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/ftp/tests/ftp_nb_fget_basic1.phpt b/ext/ftp/tests/ftp_nb_fget_basic1.phpt
index cac4eec56b..5e6389ff13 100644
--- a/ext/ftp/tests/ftp_nb_fget_basic1.phpt
+++ b/ext/ftp/tests/ftp_nb_fget_basic1.phpt
@@ -16,7 +16,7 @@ ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");
 ftp_set_option($ftp, FTP_AUTOSEEK, false);
 
-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic1.txt";
 $handle = fopen($local_file, 'w');
 
 var_dump(ftp_nb_fget($ftp, $handle, 'fget.txt', FTP_ASCII, FTP_AUTORESUME));
@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic1.txt");
 ?>
 --EXPECT--
 int(2)
diff --git a/ext/ftp/tests/ftp_nb_fget_basic2.phpt b/ext/ftp/tests/ftp_nb_fget_basic2.phpt
index dc92f4e23b..215b79ac4a 100644
--- a/ext/ftp/tests/ftp_nb_fget_basic2.phpt
+++ b/ext/ftp/tests/ftp_nb_fget_basic2.phpt
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
 ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");
 
-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic2.txt";
 file_put_contents($local_file, 'ASCIIFoo');
 $handle = fopen($local_file, 'a');
 
@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic2.txt");
 ?>
 --EXPECT--
 int(2)
diff --git a/ext/ftp/tests/ftp_nb_fget_basic3.phpt b/ext/ftp/tests/ftp_nb_fget_basic3.phpt
index d1a87c4f3d..66daf2ba0a 100644
--- a/ext/ftp/tests/ftp_nb_fget_basic3.phpt
+++ b/ext/ftp/tests/ftp_nb_fget_basic3.phpt
@@ -15,7 +15,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
 ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");
 
-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic3.txt";
 file_put_contents($local_file, 'ASCIIFoo');
 $handle = fopen($local_file, 'a');
 
@@ -24,7 +24,7 @@ var_dump(file_get_contents($local_file));
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_fget_basic3.txt");
 ?>
 --EXPECT--
 int(2)
diff --git a/ext/ftp/tests/ftp_nb_get_large.phpt b/ext/ftp/tests/ftp_nb_get_large.phpt
index 3fbf2a4831..0c354d7c19 100644
--- a/ext/ftp/tests/ftp_nb_get_large.phpt
+++ b/ext/ftp/tests/ftp_nb_get_large.phpt
@@ -18,7 +18,7 @@ $ftp = ftp_connect('127.0.0.1', $port);
 ftp_login($ftp, 'user', 'pass');
 if (!$ftp) die("Couldn't connect to the server");
 
-$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_get_large.txt";
 touch($local_file);
 ftp_nb_get($ftp, $local_file, 'fget_large.txt', FTP_BINARY, 5368709119);
 $fp = fopen($local_file, 'r');
@@ -29,7 +29,7 @@ fclose($fp);
 ?>
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "ftp_nb_get_large.txt");
 ?>
 --EXPECT--
 string(1) "X"
diff --git a/ext/spl/tests/SplFileObject_getflags_basic.phpt b/ext/spl/tests/SplFileObject_getflags_basic.phpt
index 5addadf380..88cf6861a2 100644
--- a/ext/spl/tests/SplFileObject_getflags_basic.phpt
+++ b/ext/spl/tests/SplFileObject_getflags_basic.phpt
@@ -7,16 +7,16 @@ Erwin Poeze <erwin.poeze@gmail.com>
 --FILE--
 <?php
 
-file_put_contents('testdata.csv', 'eerste;tweede;derde');
+file_put_contents('SplFileObject_getflags_basic.csv', 'eerste;tweede;derde');
 
-$fo = new SplFileObject('testdata.csv');
+$fo = new SplFileObject('SplFileObject_getflags_basic.csv');
 
 $fo->setFlags(SplFileObject::DROP_NEW_LINE);
 var_dump($fo->getFlags());
 ?>
 --CLEAN--
 <?php
-unlink('testdata.csv');
+unlink('SplFileObject_getflags_basic.csv');
 ?>
 --EXPECT--
 int(1)
diff --git a/ext/spl/tests/SplFileObject_getflags_error001.phpt b/ext/spl/tests/SplFileObject_getflags_error001.phpt
index 1602f88885..ca53c857e7 100644
--- a/ext/spl/tests/SplFileObject_getflags_error001.phpt
+++ b/ext/spl/tests/SplFileObject_getflags_error001.phpt
@@ -7,10 +7,10 @@ Erwin Poeze <erwin.poeze@gmail.com>
 --FILE--
 <?php
 
-file_put_contents('testdata.csv', 'eerste;tweede;derde');
+file_put_contents('SplFileObject_getflags_error001.csv', 'eerste;tweede;derde');
 
 
-$fo = new SplFileObject('testdata.csv');
+$fo = new SplFileObject('SplFileObject_getflags_error001.csv');
 $fo->setFlags(SplFileObject::READ_CSV);
 
 $fo->setFlags(SplFileObject::DROP_NEW_LINE);
@@ -20,7 +20,7 @@ var_dump($fo->getFlags());
 ?>
 --CLEAN--
 <?php
-unlink('testdata.csv');
+unlink('SplFileObject_getflags_error001.csv');
 ?>
 --EXPECT--
 int(1)
diff --git a/ext/spl/tests/SplFileObject_getflags_error002.phpt b/ext/spl/tests/SplFileObject_getflags_error002.phpt
index e2c8255f44..00fd351db8 100644
--- a/ext/spl/tests/SplFileObject_getflags_error002.phpt
+++ b/ext/spl/tests/SplFileObject_getflags_error002.phpt
@@ -5,9 +5,9 @@ Erwin Poeze <erwin.poeze@gmail.com>
 --FILE--
 <?php
 
-file_put_contents('testdata.csv', 'eerste;tweede;derde');
+file_put_contents('SplFileObject_getflags_error002.csv', 'eerste;tweede;derde');
 
-$fo = new SplFileObject('testdata.csv');
+$fo = new SplFileObject('SplFileObject_getflags_error002.csv');
 $fo->setFlags(SplFileObject::READ_CSV);
 
 $fo->getFlags('fake');
@@ -15,7 +15,7 @@ $fo->getFlags('fake');
 ?>
 --CLEAN--
 <?php
-unlink('testdata.csv');
+unlink('SplFileObject_getflags_error002.csv');
 ?>
 --EXPECTF--
 Warning: SplFileObject::getFlags() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/spl/tests/SplFileObject_rewind_error001.phpt b/ext/spl/tests/SplFileObject_rewind_error001.phpt
index ac536a0a44..5f2379aa13 100644
--- a/ext/spl/tests/SplFileObject_rewind_error001.phpt
+++ b/ext/spl/tests/SplFileObject_rewind_error001.phpt
@@ -7,16 +7,16 @@ Erwin Poeze <erwin.poeze@gmail.com>
 --FILE--
 <?php
 
-file_put_contents('testdata.csv', 'eerste;tweede;derde');
+file_put_contents('SplFileObject_rewind_error001.csv', 'eerste;tweede;derde');
 
-$fo = new SplFileObject('testdata.csv');
+$fo = new SplFileObject('SplFileObject_rewind_error001.csv');
 
 $fo->rewind( "invalid" );
 
 ?>
 --CLEAN--
 <?php
-unlink('testdata.csv');
+unlink('SplFileObject_rewind_error001.csv');
 ?>
 --EXPECTF--
 Warning: SplFileObject::rewind() expects exactly 0 parameters, 1 given in %s on line %d
diff --git a/ext/standard/tests/file/fgets_socket_variation1.phpt b/ext/standard/tests/file/fgets_socket_variation1.phpt
index 57944d8b56..429ad67d69 100644
--- a/ext/standard/tests/file/fgets_socket_variation1.phpt
+++ b/ext/standard/tests/file/fgets_socket_variation1.phpt
@@ -5,11 +5,17 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 --FILE--
 <?php
 
-/* Setup socket server */
-$server = stream_socket_server('tcp://127.0.0.1:31337');
+for ($i=0; $i<100; $i++) {
+  $port = rand(10000, 65000);
+  /* Setup socket server */
+  $server = @stream_socket_server("tcp://127.0.0.1:$port");
+  if ($server) {
+    break;
+  }
+}
 
 /* Connect to it */
-$client = fsockopen('tcp://127.0.0.1:31337');
+$client = fsockopen("tcp://127.0.0.1:$port");
 
 if (!$client) {
 	die("Unable to create socket");
diff --git a/ext/standard/tests/file/fgets_socket_variation2.phpt b/ext/standard/tests/file/fgets_socket_variation2.phpt
index 3500837133..da1f0b47ad 100644
--- a/ext/standard/tests/file/fgets_socket_variation2.phpt
+++ b/ext/standard/tests/file/fgets_socket_variation2.phpt
@@ -16,11 +16,17 @@ for ($i = 0; $i < 1000; $i++) {
 }
 fclose($fd);
 
-/* Setup socket server */
-$server = stream_socket_server('tcp://127.0.0.1:31337');
+for ($i=0; $i<100; $i++) {
+  $port = rand(10000, 65000);
+  /* Setup socket server */
+  $server = @stream_socket_server("tcp://127.0.0.1:$port");
+  if ($server) {
+    break;
+  }
+}
 
 /* Connect to it */
-$client = fsockopen('tcp://127.0.0.1:31337');
+$client = fsockopen("tcp://127.0.0.1:$port");
 
 if (!$client) {
 	die("Unable to create socket");
diff --git a/ext/standard/tests/file/file_put_contents_variation9.phpt b/ext/standard/tests/file/file_put_contents_variation9.phpt
index 7ad09c449d..79a42fe9b1 100644
--- a/ext/standard/tests/file/file_put_contents_variation9.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation9.phpt
@@ -17,10 +17,10 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 
 echo "*** Testing file_put_contents() : usage variation ***\n";
 
-$filename = dirname(__FILE__).'/fileGetContentsVar9.tmp';
-$softlink = dirname(__FILE__).'/fileGetContentsVar9.SoftLink';
-$hardlink = dirname(__FILE__).'/fileGetContentsVar9.HardLink';
-$chainlink = dirname(__FILE__).'/fileGetContentsVar9.ChainLink';
+$filename = dirname(__FILE__).'/filePutContentsVar9.tmp';
+$softlink = dirname(__FILE__).'/filePutContentsVar9.SoftLink';
+$hardlink = dirname(__FILE__).'/filePutContentsVar9.HardLink';
+$chainlink = dirname(__FILE__).'/filePutContentsVar9.ChainLink';
 
 
 // link files even though it original file doesn't exist yet
diff --git a/ext/standard/tests/file/fread_socket_variation1.phpt b/ext/standard/tests/file/fread_socket_variation1.phpt
index a615d2f414..f5086ced09 100644
--- a/ext/standard/tests/file/fread_socket_variation1.phpt
+++ b/ext/standard/tests/file/fread_socket_variation1.phpt
@@ -3,7 +3,14 @@ Testing fread() on a TCP server socket
 --FILE--
 <?php
 
-$tcp_socket = stream_socket_server('tcp://127.0.0.1:31337');
+for ($i=0; $i<100; $i++) {
+  $port = rand(10000, 65000);
+  /* Setup socket server */
+  $server = @stream_socket_server("tcp://127.0.0.1:$port");
+  if ($server) {
+    break;
+  }
+}
 
 socket_set_timeout($tcp_socket, 0, 1000);
 
diff --git a/ext/standard/tests/general_functions/bug41445_1.phpt b/ext/standard/tests/general_functions/bug41445_1.phpt
index e65e7afcc8..4698de436a 100644
--- a/ext/standard/tests/general_functions/bug41445_1.phpt
+++ b/ext/standard/tests/general_functions/bug41445_1.phpt
@@ -3,7 +3,7 @@ Bug #41445 (parse_ini_file() function parses octal numbers in section names) - 2
 --FILE--
 <?php
 
-$file = dirname(__FILE__)."/bug41445.ini";
+$file = dirname(__FILE__)."/bug41445_1.ini";
 
 $data = <<<DATA
 [2454.33]
diff --git a/ext/standard/tests/network/fsockopen_basic.phpt b/ext/standard/tests/network/fsockopen_basic.phpt
index 3ec9366331..227762f899 100644
--- a/ext/standard/tests/network/fsockopen_basic.phpt
+++ b/ext/standard/tests/network/fsockopen_basic.phpt
@@ -11,12 +11,18 @@ Test fsockopen() function : basic functionality
 echo "*** Testing fsockopen() : basic functionality ***\n";
 
 echo "Open a server socket\n";
-$server = stream_socket_server('tcp://127.0.0.1:31337');
 
+for ($i=0; $i<100; $i++) {
+  $port = rand(10000, 65000);
+  /* Setup socket server */
+  $server = @stream_socket_server("tcp://127.0.0.1:$port");
+  if ($server) {
+    break;
+  }
+}
 
 // Initialise all required variables
 $hostname = 'tcp://127.0.0.1'; // loopback address
-$port = 31337;
 $errno = null;
 $errstr = null;
 $timeout = 1.5;
diff --git a/ext/standard/tests/network/fsockopen_variation1.phpt b/ext/standard/tests/network/fsockopen_variation1.phpt
index 2e5f8d9ada..bb1b0f15c7 100644
--- a/ext/standard/tests/network/fsockopen_variation1.phpt
+++ b/ext/standard/tests/network/fsockopen_variation1.phpt
@@ -4,11 +4,17 @@ testing fsockopen without a protocol string
 <?php
 
 echo "Open a server socket\n";
-$server = stream_socket_server('tcp://127.0.0.1:31337');
+for ($i=0; $i<100; $i++) {
+  $port = rand(10000, 65000);
+  /* Setup socket server */
+  $server = @stream_socket_server("tcp://127.0.0.1:$port");
+  if ($server) {
+    break;
+  }
+}
 
 echo "\nCalling fsockopen() without a protocol in the hostname string:\n";
 $hostname = '127.0.0.1';
-$port = '31337';
 $client = fsockopen($hostname, $port);
 var_dump($client);
 fclose($client);
diff --git a/ext/standard/tests/network/shutdown.phpt b/ext/standard/tests/network/shutdown.phpt
index f9ab66476f..1ce77fb80e 100644
--- a/ext/standard/tests/network/shutdown.phpt
+++ b/ext/standard/tests/network/shutdown.phpt
@@ -6,14 +6,22 @@ stream_socket_shutdown() test on IPv4 TCP Loopback
 ?>
 --FILE--
 <?php
-	/* Setup socket server */
-	$server = stream_socket_server('tcp://127.0.0.1:31337');
-	if (!$server) {
+  
+  for ($i=0; $i<100; $i++) {
+    $port = rand(10000, 65000);
+    /* Setup socket server */
+    $server = @stream_socket_server("tcp://127.0.0.1:$port");
+    if ($server) {
+      break;
+    }
+  }
+	
+if (!$server) {
 		die('Unable to create AF_INET socket [server]');
 	}
 
 	/* Connect and send request 1 */
-	$client1 = stream_socket_client('tcp://127.0.0.1:31337');
+	$client1 = stream_socket_client("tcp://127.0.0.1:$port");
 	if (!$client1) {
 		die('Unable to create AF_INET socket [client]');
 	}
@@ -22,7 +30,7 @@ stream_socket_shutdown() test on IPv4 TCP Loopback
 	@fwrite($client1, "Error 1\n");
 
 	/* Connect and send request 2 */
-	$client2 = stream_socket_client('tcp://127.0.0.1:31337');
+	$client2 = stream_socket_client("tcp://127.0.0.1:$port");
 	if (!$client2) {
 		die('Unable to create AF_INET socket [client]');
 	}
diff --git a/ext/standard/tests/network/socket_get_status_basic.phpt b/ext/standard/tests/network/socket_get_status_basic.phpt
index f72662b166..46215f9838 100644
--- a/ext/standard/tests/network/socket_get_status_basic.phpt
+++ b/ext/standard/tests/network/socket_get_status_basic.phpt
@@ -3,9 +3,17 @@ Testing socket_get_status()
 --FILE--
 <?php
 
-$tcp_socket = stream_socket_server('tcp://127.0.0.1:31337');
-var_dump(socket_get_status($tcp_socket));
-fclose($tcp_socket);
+for ($i=0; $i<100; $i++) {
+  $port = rand(10000, 65000);
+  /* Setup socket server */
+  $server = @stream_socket_server("tcp://127.0.0.1:$port");
+  if ($server) {
+    break;
+  }
+}
+
+var_dump(socket_get_status($server));
+fclose($server);
 
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/network/tcp4loop.phpt b/ext/standard/tests/network/tcp4loop.phpt
index afd955918e..a163cd9b35 100644
--- a/ext/standard/tests/network/tcp4loop.phpt
+++ b/ext/standard/tests/network/tcp4loop.phpt
@@ -2,14 +2,21 @@
 Streams Based IPv4 TCP Loopback test
 --FILE--
 <?php # vim:ft=php:
-	/* Setup socket server */
-	$server = stream_socket_server('tcp://127.0.0.1:31337');
+
+  for ($i=0; $i<100; $i++) {
+    $port = rand(10000, 65000);
+    /* Setup socket server */
+    $server = @stream_socket_server("tcp://127.0.0.1:$port");
+    if ($server) {
+      break;
+    }
+  }
 	if (!$server) {
 		die('Unable to create AF_INET socket [server]');
 	}
 
 	/* Connect to it */
-	$client = stream_socket_client('tcp://127.0.0.1:31337');
+	$client = stream_socket_client("tcp://127.0.0.1:$port");
 	if (!$client) {
 		die('Unable to create AF_INET socket [client]');
 	}
diff --git a/ext/standard/tests/network/tcp6loop.phpt b/ext/standard/tests/network/tcp6loop.phpt
index 3f28cd4437..30b1d7bcd2 100644
--- a/ext/standard/tests/network/tcp6loop.phpt
+++ b/ext/standard/tests/network/tcp6loop.phpt
@@ -10,14 +10,22 @@ Streams Based IPv6 TCP Loopback test
 ?>
 --FILE--
 <?php
-	/* Setup socket server */
-	$server = stream_socket_server('tcp://[::1]:31337');
+
+  for ($i=0; $i<100; $i++) {
+    $port = rand(10000, 65000);
+    /* Setup socket server */
+    $server = @stream_socket_server("tcp://[::1]:$port");
+    if ($server) {
+      break;
+    }
+  }
+
 	if (!$server) {
 		die('Unable to create AF_INET6 socket [server]');
 	}
 
 	/* Connect to it */
-	$client = stream_socket_client('tcp://[::1]:31337');
+	$client = stream_socket_client("tcp://[::1]:$port");
 	if (!$client) {
 		die('Unable to create AF_INET6 socket [client]');
 	}
diff --git a/ext/standard/tests/network/udp6loop.phpt b/ext/standard/tests/network/udp6loop.phpt
index 5fcf7a7f46..8241d80bac 100644
--- a/ext/standard/tests/network/udp6loop.phpt
+++ b/ext/standard/tests/network/udp6loop.phpt
@@ -16,14 +16,22 @@ Streams Based IPv6 UDP Loopback test
 ?>
 --FILE--
 <?php
-	/* Setup socket server */
-	$server = stream_socket_server('udp://[::1]:31337', $errno, $errstr, STREAM_SERVER_BIND);
+
+  for ($i=0; $i<100; $i++) {
+    $port = rand(10000, 65000);
+    /* Setup socket server */
+    $server = @stream_socket_server("udp://[::1]:$port", $errno, $errstr, STREAM_SERVER_BIND);
+    if ($server) {
+      break;
+    }
+  }
+
 	if (!$server) {
 		die('Unable to create AF_INET6 socket [server]');
 	}
 
 	/* Connect to it */
-	$client = stream_socket_client('udp://[::1]:31337');
+	$client = stream_socket_client("udp://[::1]:$port");
 	if (!$client) {
 		die('Unable to create AF_INET6 socket [client]');
 	}
diff --git a/ext/standard/tests/streams/stream_set_timeout_error.phpt b/ext/standard/tests/streams/stream_set_timeout_error.phpt
index c1d4d1406f..814257dd93 100644
--- a/ext/standard/tests/streams/stream_set_timeout_error.phpt
+++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt
@@ -13,10 +13,16 @@ echo "*** Testing stream_set_timeout() : error conditions ***\n";
 //Test stream_set_timeout with one more than the expected number of arguments
 echo "\n-- Testing stream_set_timeout() function with more than expected no. of arguments --\n";
 
-/* Setup socket server */
-$server = stream_socket_server('tcp://127.0.0.1:31337');
+for ($i=0; $i<100; $i++) {
+  $port = rand(10000, 65000);
+  /* Setup socket server */
+  $server = @stream_socket_server("tcp://127.0.0.1:$port");
+  if ($server) {
+    break;
+  }
+}
 /* Connect to it */
-$client = fsockopen('tcp://127.0.0.1:31337');
+$client = fsockopen("tcp://127.0.0.1:$port");
 
 $seconds = 10;
 $microseconds = 10;
diff --git a/ext/standard/tests/strings/vfprintf_basic1.phpt b/ext/standard/tests/strings/vfprintf_basic1.phpt
index 3129d4fcca..84d8ad101d 100644
--- a/ext/standard/tests/strings/vfprintf_basic1.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic1.phpt
@@ -20,7 +20,7 @@ $arg3 = array("one","two","three");
 
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_basic1.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_basic2.phpt b/ext/standard/tests/strings/vfprintf_basic2.phpt
index b758caeecc..36d6577bbd 100644
--- a/ext/standard/tests/strings/vfprintf_basic2.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic2.phpt
@@ -23,7 +23,7 @@ $arg2 = array(111,222);
 $arg3 = array(111,222,333);
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_basic2.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_basic3.phpt b/ext/standard/tests/strings/vfprintf_basic3.phpt
index b675b3db88..565079dc60 100644
--- a/ext/standard/tests/strings/vfprintf_basic3.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic3.phpt
@@ -24,7 +24,7 @@ $arg2 = array(11.11,22.22);
 $arg3 = array(11.11,22.22,33.33);
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_basic3.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_basic4.phpt b/ext/standard/tests/strings/vfprintf_basic4.phpt
index 1595f034bb..e653f63306 100644
--- a/ext/standard/tests/strings/vfprintf_basic4.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic4.phpt
@@ -19,7 +19,7 @@ $arg2 = array(TRUE,FALSE);
 $arg3 = array(TRUE,FALSE,TRUE);
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_basic4.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_basic5.phpt b/ext/standard/tests/strings/vfprintf_basic5.phpt
index a080c9e6c4..84fbe33f1c 100644
--- a/ext/standard/tests/strings/vfprintf_basic5.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic5.phpt
@@ -19,7 +19,7 @@ $arg2 = array(65,66);
 $arg3 = array(65,66,67);
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_basic5.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
    
diff --git a/ext/standard/tests/strings/vfprintf_basic6.phpt b/ext/standard/tests/strings/vfprintf_basic6.phpt
index ed88a2832e..6c1bbf02a2 100644
--- a/ext/standard/tests/strings/vfprintf_basic6.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic6.phpt
@@ -20,7 +20,7 @@ $arg2 = array(1000,2000);
 $arg3 = array(1000,2000,3000);
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_basic6.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
    
diff --git a/ext/standard/tests/strings/vfprintf_basic7.phpt b/ext/standard/tests/strings/vfprintf_basic7.phpt
index 45544a39ec..f4c11edc15 100644
--- a/ext/standard/tests/strings/vfprintf_basic7.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic7.phpt
@@ -23,7 +23,7 @@ $arg2 = array(-1111,-1234567);
 $arg3 = array(-1111,-1234567,-2345432);
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_basic7.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
    
diff --git a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt
index 77fae2c09b..14cd31ddd2 100644
--- a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt
@@ -23,7 +23,7 @@ $arg2 = array(-1111,-1234567);
 $arg3 = array(-1111,-1234567,-2345432);
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_basic7_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
    
diff --git a/ext/standard/tests/strings/vfprintf_basic8.phpt b/ext/standard/tests/strings/vfprintf_basic8.phpt
index 6fe2151542..bf7eb96ad5 100644
--- a/ext/standard/tests/strings/vfprintf_basic8.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic8.phpt
@@ -19,7 +19,7 @@ $arg2 = array(021,0347);
 $arg3 = array(021,0347,05678);
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_basic8.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
    
diff --git a/ext/standard/tests/strings/vfprintf_basic9.phpt b/ext/standard/tests/strings/vfprintf_basic9.phpt
index 8294c8482f..080e52bb64 100644
--- a/ext/standard/tests/strings/vfprintf_basic9.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic9.phpt
@@ -24,7 +24,7 @@ $arg2 = array(11,132);
 $arg3 = array(11,132,177);
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_basic9.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation10.phpt b/ext/standard/tests/strings/vfprintf_variation10.phpt
index e2c066eff8..bb00e70389 100644
Binary files a/ext/standard/tests/strings/vfprintf_variation10.phpt and b/ext/standard/tests/strings/vfprintf_variation10.phpt differ
diff --git a/ext/standard/tests/strings/vfprintf_variation11.phpt b/ext/standard/tests/strings/vfprintf_variation11.phpt
index 45f1f61fa6..4bc38851d2 100644
--- a/ext/standard/tests/strings/vfprintf_variation11.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation11.phpt
@@ -45,7 +45,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation11.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt
index d6549846b5..a55297999e 100644
--- a/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt
@@ -45,7 +45,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation11_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation12.phpt b/ext/standard/tests/strings/vfprintf_variation12.phpt
index e95fd5bb7f..f0fa354ea6 100644
--- a/ext/standard/tests/strings/vfprintf_variation12.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation12.phpt
@@ -68,7 +68,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation12.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
index a1e57bc42c..fe786d3f49 100644
--- a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
@@ -68,7 +68,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation12_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation13.phpt b/ext/standard/tests/strings/vfprintf_variation13.phpt
index 245feb5a23..fd34242424 100644
--- a/ext/standard/tests/strings/vfprintf_variation13.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation13.phpt
@@ -45,7 +45,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation13.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt
index bf6fcb5ec0..68baed8537 100644
--- a/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt
@@ -45,7 +45,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation13_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation14.phpt b/ext/standard/tests/strings/vfprintf_variation14.phpt
index c714d89758..0173a27fb7 100644
--- a/ext/standard/tests/strings/vfprintf_variation14.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation14.phpt
@@ -68,7 +68,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation14.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
index 930ee3d03d..fb34befd3c 100644
--- a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
@@ -68,7 +68,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation14_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation15.phpt b/ext/standard/tests/strings/vfprintf_variation15.phpt
index 95667b5a81..19e319a557 100644
--- a/ext/standard/tests/strings/vfprintf_variation15.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation15.phpt
@@ -38,7 +38,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation15.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt
index d2e331c2d3..7bb0d150e0 100644
--- a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt
@@ -38,7 +38,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation15_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt
index 21630521b8..4995ab02a4 100644
--- a/ext/standard/tests/strings/vfprintf_variation16.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation16.phpt
@@ -61,7 +61,7 @@ $args_array = array(
 );
  
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation16.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt
index 381e67c339..16d0624018 100644
--- a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt
@@ -61,7 +61,7 @@ $args_array = array(
 );
  
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation16_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation17.phpt b/ext/standard/tests/strings/vfprintf_variation17.phpt
index 871ae98d85..6c17b801f6 100644
--- a/ext/standard/tests/strings/vfprintf_variation17.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation17.phpt
@@ -34,7 +34,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation17.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
    
diff --git a/ext/standard/tests/strings/vfprintf_variation18.phpt b/ext/standard/tests/strings/vfprintf_variation18.phpt
index 76168621c3..5467753dc0 100644
--- a/ext/standard/tests/strings/vfprintf_variation18.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation18.phpt
@@ -57,7 +57,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation18.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
    
diff --git a/ext/standard/tests/strings/vfprintf_variation19.phpt b/ext/standard/tests/strings/vfprintf_variation19.phpt
index 7ee01a97e1..26c21e1e3c 100644
--- a/ext/standard/tests/strings/vfprintf_variation19.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation19.phpt
@@ -46,7 +46,7 @@ $args_array = array(
 
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation19.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
    
diff --git a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
index 58810a811a..a56357cfdf 100644
--- a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
@@ -46,7 +46,7 @@ $args_array = array(
 
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation19_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
    
diff --git a/ext/standard/tests/strings/vfprintf_variation20.phpt b/ext/standard/tests/strings/vfprintf_variation20.phpt
index cd348d8350..48fea341ed 100644
--- a/ext/standard/tests/strings/vfprintf_variation20.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation20.phpt
@@ -84,7 +84,7 @@ $values = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation20.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation21.phpt b/ext/standard/tests/strings/vfprintf_variation21.phpt
index 4dc9ed5666..09bf703957 100644
--- a/ext/standard/tests/strings/vfprintf_variation21.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation21.phpt
@@ -81,7 +81,7 @@ $values = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation21.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation3.phpt b/ext/standard/tests/strings/vfprintf_variation3.phpt
index 02535cefb6..1ae945990c 100644
--- a/ext/standard/tests/strings/vfprintf_variation3.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation3.phpt
@@ -45,7 +45,7 @@ $args_array = array(
 // and with int values from the above $args_array array
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation3.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt
index 72ca9fe3b9..642f35c46a 100644
--- a/ext/standard/tests/strings/vfprintf_variation4.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation4.phpt
@@ -62,7 +62,7 @@ $args_array = array(
 
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation4.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt
index f7038ff76c..6bf814003a 100644
--- a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt
@@ -62,7 +62,7 @@ $args_array = array(
 
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation4_64bit.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation5.phpt b/ext/standard/tests/strings/vfprintf_variation5.phpt
index 4bac1ebe57..eb3646ca1f 100644
--- a/ext/standard/tests/strings/vfprintf_variation5.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation5.phpt
@@ -42,7 +42,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation5.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation6.phpt b/ext/standard/tests/strings/vfprintf_variation6.phpt
index 6b5425d5cf..b5b82bbc62 100644
--- a/ext/standard/tests/strings/vfprintf_variation6.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation6.phpt
@@ -57,7 +57,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation6.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation7.phpt b/ext/standard/tests/strings/vfprintf_variation7.phpt
index a206fd8691..ee836edc77 100644
Binary files a/ext/standard/tests/strings/vfprintf_variation7.phpt and b/ext/standard/tests/strings/vfprintf_variation7.phpt differ
diff --git a/ext/standard/tests/strings/vfprintf_variation8.phpt b/ext/standard/tests/strings/vfprintf_variation8.phpt
index cda05c4d79..a72e260e09 100644
--- a/ext/standard/tests/strings/vfprintf_variation8.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation8.phpt
@@ -60,7 +60,7 @@ $args_array = array(
 );
 
 /* creating dumping file */
-$data_file = dirname(__FILE__) . '/dump.txt';
+$data_file = dirname(__FILE__) . '/vfprintf_variation8.txt';
 if (!($fp = fopen($data_file, 'wt')))
    return;
 
diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt
index d10c8aed50..dd3093c8c9 100644
Binary files a/ext/standard/tests/strings/vfprintf_variation9.phpt and b/ext/standard/tests/strings/vfprintf_variation9.phpt differ
diff --git a/ext/zlib/tests/gzeof_variation1.phpt b/ext/zlib/tests/gzeof_variation1.phpt
index 6d1e0401df..77a1eccb66 100644
--- a/ext/zlib/tests/gzeof_variation1.phpt
+++ b/ext/zlib/tests/gzeof_variation1.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = dirname(__FILE__)."/temp.txt.gz";
+$filename = dirname(__FILE__)."/gzeof_variation1.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/ext/zlib/tests/gzfile_basic.phpt b/ext/zlib/tests/gzfile_basic.phpt
index 1fceea5b90..17055646d8 100644
--- a/ext/zlib/tests/gzfile_basic.phpt
+++ b/ext/zlib/tests/gzfile_basic.phpt
@@ -12,7 +12,7 @@ is a very common test
 for all languages
 EOT;
 $dirname = 'gzfile_temp';
-$filename = $dirname.'/plainfile.txt.gz';
+$filename = $dirname.'/gzfile_basic.txt.gz';
 mkdir($dirname);
 $h = gzopen($filename, 'w');
 gzwrite($h, $plaintxt);
@@ -36,4 +36,4 @@ array(3) {
   [2]=>
   string(17) "for all languages"
 }
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzfile_basic2.phpt b/ext/zlib/tests/gzfile_basic2.phpt
index 9f31eb0f87..2bbf315a1a 100644
--- a/ext/zlib/tests/gzfile_basic2.phpt
+++ b/ext/zlib/tests/gzfile_basic2.phpt
@@ -12,7 +12,7 @@ is a very common test
 for all languages
 EOT;
 $dirname = 'gzfile_temp';
-$filename = $dirname.'/plainfile.txt';
+$filename = $dirname.'/gzfile_basic2.txt';
 mkdir($dirname);
 $h = fopen($filename, 'w');
 fwrite($h, $plaintxt);
@@ -36,4 +36,4 @@ array(3) {
   [2]=>
   string(17) "for all languages"
 }
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/zlib/tests/gzopen_basic2.phpt b/ext/zlib/tests/gzopen_basic2.phpt
index 5cc02cd182..90766b1817 100644
--- a/ext/zlib/tests/gzopen_basic2.phpt
+++ b/ext/zlib/tests/gzopen_basic2.phpt
@@ -18,7 +18,7 @@ echo "*** Testing gzopen() : basic functionality ***\n";
 
 
 // Initialise all required variables
-$filename = "temp.txt.gz";
+$filename = "gzopen_basic2.txt.gz";
 $modes = array('w', 'w+');
 $data = "This was the information that was written";
 
diff --git a/ext/zlib/tests/gzputs_basic.phpt b/ext/zlib/tests/gzputs_basic.phpt
index 7566e74e72..6456e4b55f 100644
--- a/ext/zlib/tests/gzputs_basic.phpt
+++ b/ext/zlib/tests/gzputs_basic.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = dirname(__FILE__)."/temp.txt.gz";
+$filename = dirname(__FILE__)."/gzputs_basic.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/ext/zlib/tests/gzread_variation1.phpt b/ext/zlib/tests/gzread_variation1.phpt
index 1f50d77126..966351e736 100644
--- a/ext/zlib/tests/gzread_variation1.phpt
+++ b/ext/zlib/tests/gzread_variation1.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "gzread_variation1.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 var_dump(gzread($h, 100));
diff --git a/ext/zlib/tests/gzwrite_basic.phpt b/ext/zlib/tests/gzwrite_basic.phpt
index 0d7521625d..46553eedf1 100644
--- a/ext/zlib/tests/gzwrite_basic.phpt
+++ b/ext/zlib/tests/gzwrite_basic.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "gzwrite_basic.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/ext/zlib/tests/gzwrite_error.phpt b/ext/zlib/tests/gzwrite_error.phpt
index b84a1db0c8..b4ddbb2ec7 100644
--- a/ext/zlib/tests/gzwrite_error.phpt
+++ b/ext/zlib/tests/gzwrite_error.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
-$filename = "temp.txt.gz";
+$filename = "gzwrite_error.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/ext/zlib/tests/gzwrite_error2.phpt b/ext/zlib/tests/gzwrite_error2.phpt
index 691275055d..5f2a4197b5 100644
--- a/ext/zlib/tests/gzwrite_error2.phpt
+++ b/ext/zlib/tests/gzwrite_error2.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "gzwrite_error2.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 var_dump(gzwrite( $h, $str, 0 ) );
diff --git a/ext/zlib/tests/readgzfile_basic.phpt b/ext/zlib/tests/readgzfile_basic.phpt
index 2d180c1a56..5fd539e21c 100644
--- a/ext/zlib/tests/readgzfile_basic.phpt
+++ b/ext/zlib/tests/readgzfile_basic.phpt
@@ -13,7 +13,7 @@ for all languages
 
 EOT;
 $dirname = 'readgzfile_temp';
-$filename = $dirname.'/plainfile.txt.gz';
+$filename = $dirname.'/readgzfile_basic.txt.gz';
 mkdir($dirname);
 $h = gzopen($filename, 'w');
 gzwrite($h, $plaintxt);
diff --git a/ext/zlib/tests/readgzfile_basic2.phpt b/ext/zlib/tests/readgzfile_basic2.phpt
index 99d216a55e..5402f960c2 100644
--- a/ext/zlib/tests/readgzfile_basic2.phpt
+++ b/ext/zlib/tests/readgzfile_basic2.phpt
@@ -13,7 +13,7 @@ for all languages
 
 EOT;
 $dirname = 'readgzfile_temp';
-$filename = $dirname.'/plainfile.txt';
+$filename = $dirname.'/readgzfile_basic2.txt';
 mkdir($dirname);
 $h = fopen($filename, 'w');
 fwrite($h, $plaintxt);
diff --git a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
index 74ccc0dabb..de1318cfed 100644
--- a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "zlib_wrapper_fflush_basic.txt.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written.";
 $length = 10;
diff --git a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
index 53b140ac56..348e24505c 100644
--- a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded("zlib")) {
 --FILE--
 <?php
 $f = dirname(__FILE__)."/004.txt.gz";
-$f2 = "temp.txt.gz";
+$f2 = "zlib_wrapper_ftruncate_basic.txt.gz";
 copy($f, $f2);
 
 $h = gzopen($f2, "r");