From b3ededfdc6e9295796017c9f9e27c85831abff2b Mon Sep 17 00:00:00 2001
From: Paul Tarjan <ptarjan@fb.com>
Date: Thu, 9 May 2013 07:43:45 -0700
Subject: [PATCH] fix flakey text

reported by @aalexandre. Sharing filenames is bad.

done with

  ./tools/import_zend_test.py -z /tmp/php-5.4.13/ -o bug41445
---
 .../zend/good/ext-standard-general_functions/bug41445_1.php   | 2 +-
 hphp/tools/import_zend_test.py                                | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hphp/test/zend/good/ext-standard-general_functions/bug41445_1.php b/hphp/test/zend/good/ext-standard-general_functions/bug41445_1.php
index 7f485d564..0f43f15ad 100644
--- a/hphp/test/zend/good/ext-standard-general_functions/bug41445_1.php
+++ b/hphp/test/zend/good/ext-standard-general_functions/bug41445_1.php
@@ -1,6 +1,6 @@
 <?php
 
-$file = dirname(__FILE__)."/bug41445.ini";
+$file = dirname(__FILE__)."/bug41445_1.ini";
 
 $data = <<<DATA
 [2454.33]
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index b2b049687..2e4766ec6 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -235,7 +235,6 @@ other_files = (
     '/ext-standard-file/test2.csv',
     '/ext-standard-file/test3.csv',
     '/ext-standard-file/fopen_include_path.inc',
-    '/ext-standard-general_functions/bug41445.ini',
     '/ext-standard-image/bug13213.jpg',
     '/ext-standard-image/246x247.png',
     '/ext-standard-image/384x385.png',
@@ -534,6 +533,9 @@ def walk(filename, source):
         test = test.replace('symlink.txt', 'lchgrp_basic_symlink.txt')
     if '/ext-standard-file/tempnam_variation5.php' in full_dest_filename:
         test = test.replace('tempnam_variation6', 'tempnam_variation5')
+    if '/ext-standard-general_functions/bug41445_1.php' in full_dest_filename:
+        test = test.replace('bug41445.ini', 'bug41445_1.ini')
+
 
 
     file(full_dest_filename, 'w').write(test)