From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Sat, 17 May 2003 20:00:46 +0000 (+0000)
Subject: Fixed the test so it won't fail under safe mode
X-Git-Tag: BEFORE_FD_REVERT~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2660ef64aad441c10e120e80cd5b37790be8b94;p=php

Fixed the test so it won't fail under safe mode
---

diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt
index 929c648e5d..b27e805737 100644
--- a/ext/standard/tests/file/bug22414.phpt
+++ b/ext/standard/tests/file/bug22414.phpt
@@ -7,11 +7,11 @@ Bug #22414: passthru() does not read data correctly
 	}
 ?>
 --INI--
-output_handler=
+output_handler=a
 --FILE--
 <?php
-	$php = getenv('TEST_PHP_EXECUTABLE');
-	$pwd = realpath(dirname(__FILE__));
+$php = getenv('TEST_PHP_EXECUTABLE');
+$tmpfile = tempnam('/tmp', 'phpt');
 	
 	/* Regular Data Test */
 	passthru($php . ' -r " echo \"HELLO\"; "');
@@ -22,16 +22,16 @@ output_handler=
 	@unlink($pwd . '/passthru_test');
 	
 	$cmd = $php . " -r \\\" readfile(@getenv(TEST_PHP_EXECUTABLE)); \\\"";
-	$cmd = $php . ' -r \' passthru("'.$cmd.'"); \' > ' . $pwd . '/passthru_test';
+	$cmd = $php . ' -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ;
 	exec($cmd);
 	
-	if (md5_file($php) == md5_file($pwd . '/passthru_test')) {
+	if (md5_file($php) == md5_file($tmpfile)) {
 		echo "Works\n";
 	} else {
 		echo "Does not work\n";
 	}
 	
-	@unlink($pwd . '/passthru_test');
+	@unlink($tmpfile);
 ?>
 --EXPECT--
 HELLO