From af5e2eaf8d1ea57e5961993553170ee00268fe26 Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Mon, 17 Jun 2013 01:03:20 -0700
Subject: Merge branch 'pull-request/320'

* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test
---
 ext/xmlreader/tests/003.phpt | 2 +-
 ext/xmlreader/tests/004.phpt | 2 +-
 ext/xmlreader/tests/007.phpt | 2 +-
 ext/xmlreader/tests/008.phpt | 2 +-
 ext/xmlreader/tests/012.phpt | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'ext/xmlreader')

diff --git a/ext/xmlreader/tests/003.phpt b/ext/xmlreader/tests/003.phpt
index 48aa4be0ba..85353a8242 100644
--- a/ext/xmlreader/tests/003.phpt
+++ b/ext/xmlreader/tests/003.phpt
@@ -5,7 +5,7 @@ XMLReader: libxml2 XML Reader, attributes test
 --FILE--
 <?php 
 /* $Id$ */
-$filename = dirname(__FILE__) . '/_002.xml';
+$filename = dirname(__FILE__) . '/_003.xml';
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';
diff --git a/ext/xmlreader/tests/004.phpt b/ext/xmlreader/tests/004.phpt
index d4f044e97f..b2d7254fe4 100644
--- a/ext/xmlreader/tests/004.phpt
+++ b/ext/xmlreader/tests/004.phpt
@@ -5,7 +5,7 @@ XMLReader: libxml2 XML Reader, attributes test
 --FILE--
 <?php 
 /* $Id$ */
-$filename = dirname(__FILE__) . '/_002.xml';
+$filename = dirname(__FILE__) . '/_004.xml';
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';
diff --git a/ext/xmlreader/tests/007.phpt b/ext/xmlreader/tests/007.phpt
index 842f25e5f6..aacd059b6e 100644
--- a/ext/xmlreader/tests/007.phpt
+++ b/ext/xmlreader/tests/007.phpt
@@ -8,7 +8,7 @@ XMLReader: libxml2 XML Reader, setRelaxNGSchema
 
 $xmlstring = '<TEI.2>hello</TEI.2>';
 $relaxngfile = dirname(__FILE__) . '/relaxNG.rng'; 
-$file = dirname(__FILE__) . '/__007.xml';
+$file = dirname(__FILE__) . '/_007.xml';
 file_put_contents($file, $xmlstring);
 
 $reader = new XMLReader();
diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt
index e3af00e4f7..2dbb5e7c87 100644
--- a/ext/xmlreader/tests/008.phpt
+++ b/ext/xmlreader/tests/008.phpt
@@ -23,7 +23,7 @@ $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 </LIST>';
 
 $dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd'; 
-$file = dirname(__FILE__) . '/__008.xml';
+$file = dirname(__FILE__) . '/_008.xml';
 file_put_contents($file, $xmlstring);
 
 
diff --git a/ext/xmlreader/tests/012.phpt b/ext/xmlreader/tests/012.phpt
index e0edeef2dd..94fb34038c 100644
--- a/ext/xmlreader/tests/012.phpt
+++ b/ext/xmlreader/tests/012.phpt
@@ -38,7 +38,7 @@ $reader->close();
 
 echo "\nUsing URI:\n";
 $reader = new XMLReader();
-$file = dirname(__FILE__) . '/012.xml';
+$file = dirname(__FILE__) . '/_012.xml';
 if (DIRECTORY_SEPARATOR == '\\') {
 	$file = str_replace('\\',"/", $file);
 }
@@ -52,7 +52,7 @@ var_dump($reader->getAttribute('baz'));
 $reader->close();
 
 $reader = new XMLReader();
-$reader->open(dirname(__FILE__) . '/012.xml');
+$reader->open(dirname(__FILE__) . '/_012.xml');
 $reader->setParserProperty(XMLReader::DEFAULTATTRS, true);
 while($reader->read() && $reader->nodeType != XMLReader::ELEMENT);
 var_dump($reader->getAttribute('bar'));
-- 
cgit v1.2.1