From: andy wharmby <wharmby@php.net>
Date: Tue, 13 Jan 2009 18:51:24 +0000 (+0000)
Subject: Fix test. Tested on Windows, Linux and Linux 64 bit
X-Git-Tag: php-5.4.0alpha1~191^2~4530
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cc4833a956eb85e9239180b13fe83d7574b87cc;p=php

Fix test. Tested on Windows, Linux and Linux 64 bit
---

diff --git a/ext/standard/tests/file/parse_ini_file_variation3.phpt b/ext/standard/tests/file/parse_ini_file_variation3.phpt
index 2bd4fb1549..0037d64399 100644
--- a/ext/standard/tests/file/parse_ini_file_variation3.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation3.phpt
@@ -12,7 +12,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 
 echo "*** Testing parse_ini_file() : variation ***\n";
 $pwd = getcwd();
-$f = basename(__FILE__);
+$f = "parse_ini_file_variation3";
 $dir1 = $pwd."/".$f.".dir1";
 $dir2 = $pwd."/".$f.".dir2";
 $dir3 = $pwd."/".$f.".dir3";
@@ -29,12 +29,10 @@ foreach($newdirs as $newdir) {
    $newIncludePath .= $newdir.$pathSep;
 }
 
-
-var_dump(parse_ini_file($iniFile));
 set_include_path($newIncludePath);
-var_dump(parse_ini_file($iniFile));
-
-
+$path = get_include_path();
+echo "New include path is : " . $path . "\n";
+ 
 $output_file = $dir2."/".$iniFile;
 $iniContent = <<<FILE
 error_reporting  =  E_ALL
@@ -54,27 +52,34 @@ FILE;
 file_put_contents($output_file, $iniContent);
 var_dump(parse_ini_file($iniFile));
 
+?>
+===Done===
+--CLEAN--
+<?php
+
+$pwd = getcwd();
+$f = "parse_ini_file_variation3";
+$iniFile = "php.ini";
+
+$dir1 = $pwd."/".$f.".dir1";
+$dir2 = $pwd."/".$f.".dir2";
+$dir3 = $pwd."/".$f.".dir3";
+$newdirs = array($dir1, $dir2, $dir3);
+$output_file = $dir2."/".$iniFile;
+
+// Tidy up after test
 unlink($output_file);
 foreach($newdirs as $newdir) {
    rmdir($newdir);
 }
 
-
-
-
 ?>
-===DONE===
 --EXPECTF--
 *** Testing parse_ini_file() : variation ***
-
-Warning: parse_ini_file(php.ini): failed to open stream: No such file or directory in %s on line %d
-bool(false)
-
-Warning: parse_ini_file(php.ini): failed to open stream: No such file or directory in %s on line %d
-bool(false)
+New include path is : %sparse_ini_file_variation3.dir1%sparse_ini_file_variation3.dir2%sparse_ini_file_variation3.dir3%S
 array(11) {
   [u"error_reporting"]=>
-  unicode(%d) "%d"
+  unicode(5) "32767"
   [u"display_errors"]=>
   unicode(1) "1"
   [u"display_startup_errors"]=>
@@ -96,5 +101,4 @@ array(11) {
   [u"docref_ext"]=>
   unicode(5) ".html"
 }
-===DONE===
-
+===Done===
\ No newline at end of file