From: Steph Fox <sfox@php.net>
Date: Mon, 3 Mar 2008 19:36:09 +0000 (+0000)
Subject: fix tests
X-Git-Tag: RELEASE_2_0_0a1~267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e4b47fa87171a4b1814c57cbc27af35d7714e14;p=php

fix tests
---

diff --git a/ext/phar/tests/phar_convert_repeated.phpt b/ext/phar/tests/phar_convert_repeated.phpt
index 300a91ac7e..0e3c8d9792 100644
--- a/ext/phar/tests/phar_convert_repeated.phpt
+++ b/ext/phar/tests/phar_convert_repeated.phpt
@@ -90,7 +90,7 @@ var_dump($phar->getAlias());
 <?php 
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip');
 ?>
---EXPECT--
+--EXPECTF--
 =================== new Phar() =======================
 bool(true)
 bool(false)
@@ -103,39 +103,39 @@ bool(true)
 bool(false)
 string(60) "<?php // tar-based phar archive stub file
 __HALT_COMPILER();"
-string(57) "C:/sandbox/pecl/phar/tests/phar_convert_repeated.phar.tar"
+string(%d) "%sphar_convert_repeated.phar.tar"
 ================= convertToZip() =====================
 bool(false)
 bool(false)
 bool(true)
 string(60) "<?php // zip-based phar archive stub file
 __HALT_COMPILER();"
-string(57) "C:/sandbox/pecl/phar/tests/phar_convert_repeated.phar.zip"
+string(%d) "%sphar_convert_repeated.phar.zip"
 ================= convertToPhar() ====================
 bool(true)
 bool(false)
 bool(false)
 int(6573)
-string(53) "C:/sandbox/pecl/phar/tests/phar_convert_repeated.phar"
+string(%d) "%sphar_convert_repeated.phar"
 ================= convertToZip() =====================
 bool(false)
 bool(false)
 bool(true)
 string(60) "<?php // zip-based phar archive stub file
 __HALT_COMPILER();"
-string(57) "C:/sandbox/pecl/phar/tests/phar_convert_repeated.phar.zip"
+string(%d) "%sphar_convert_repeated.phar.zip"
 ================= convertToTar() =====================
 bool(false)
 bool(true)
 bool(false)
 string(60) "<?php // tar-based phar archive stub file
 __HALT_COMPILER();"
-string(57) "C:/sandbox/pecl/phar/tests/phar_convert_repeated.phar.tar"
+string(%d) "%sphar_convert_repeated.phar.tar"
 ================= convertToZip() =====================
 bool(false)
 bool(false)
 bool(true)
 string(60) "<?php // zip-based phar archive stub file
 __HALT_COMPILER();"
-string(57) "C:/sandbox/pecl/phar/tests/phar_convert_repeated.phar.zip"
+string(%d) "%sphar_convert_repeated.phar.zip"
 ===DONE===
diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt
index 5f81c96c38..f5d5df2713 100644
--- a/ext/phar/tests/tar/tar_001.phpt
+++ b/ext/phar/tests/tar/tar_001.phpt
@@ -26,6 +26,6 @@ try {
 @unlink(dirname(__FILE__) . '/tar_001.phar.tar');
 ?>
 --EXPECTF--
-Warning: fopen(phar://C:\sandbox\pecl\phar\tests\tar/tar_001.phar.tar/tar_001.phpt): failed to open stream: phar error: "C:\sandbox\pecl\phar\tests\tar\tar_001.phar.tar" is a corrupted tar file in C:\sandbox\pecl\phar\tests\tar\tar_001.php on line 9
-phar error: "C:\sandbox\pecl\phar\tests\tar\tar_001.phar.tar" is a corrupted tar file
+Warning: fopen(phar://%star_001.phar.tar/tar_001.phpt): failed to open stream: phar error: "%star_001.phar.tar" is a corrupted tar file in %star_001.php on line 9
+phar error: "%star_001.phar.tar" is a corrupted tar file
 ===DONE===
diff --git a/ext/phar/tests/tar/tar_002.phpt b/ext/phar/tests/tar/tar_002.phpt
index cacc7391a2..e5d778e705 100644
--- a/ext/phar/tests/tar/tar_002.phpt
+++ b/ext/phar/tests/tar/tar_002.phpt
@@ -29,6 +29,6 @@ try {
 @unlink(dirname(__FILE__) . '/tar_002.phar.tar');
 ?>
 --EXPECTF--
-Warning: fopen(phar://C:\sandbox\pecl\phar\tests\tar/tar_002.phar.tar/tar_002.phpt): failed to open stream: phar error: "C:\sandbox\pecl\phar\tests\tar\tar_002.phar.tar" is a corrupted tar file in C:\sandbox\pecl\phar\tests\tar\tar_002.php on line 9
-phar error: "C:\sandbox\pecl\phar\tests\tar\tar_002.phar.tar" is a corrupted tar file
+Warning: fopen(phar://%star_002.phar.tar/tar_002.phpt): failed to open stream: phar error: "%star_002.phar.tar" is a corrupted tar file in %star_002.php on line 9
+phar error: "%star_002.phar.tar" is a corrupted tar file
 ===DONE===