From: Greg Beaver <cellog@php.net>
Date: Sun, 12 Oct 2008 23:33:08 +0000 (+0000)
Subject: MFB: fix faulty tests
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~237
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0315794cf485e2ae745df5c0131ed3aadab8c8f3;p=php

MFB: fix faulty tests
---

diff --git a/ext/phar/tests/tar/rmdir.phpt b/ext/phar/tests/tar/rmdir.phpt
index d08e521614..be037823d6 100644
--- a/ext/phar/tests/tar/rmdir.phpt
+++ b/ext/phar/tests/tar/rmdir.phpt
@@ -23,6 +23,7 @@ $files['a/x'] = 'a';
 foreach ($files as $n => $file) {
 	$tar->addFile($n, $file);
 }
+$tar->mkdir('a');
 
 $tar->close();
 
@@ -39,7 +40,7 @@ var_dump(rmdir($alias . '/a'));
 --EXPECTF--
 a
 
-Warning: rmdir(): phar error: Directory not empty in %srmdir.php on line 24
+Warning: rmdir(): phar error: Directory not empty in %srmdir.php on line %d
 bool(false)
 a
 bool(true)
diff --git a/ext/phar/tests/zip/rmdir.phpt b/ext/phar/tests/zip/rmdir.phpt
index 149f0e8d6b..c7ef9dacac 100644
--- a/ext/phar/tests/zip/rmdir.phpt
+++ b/ext/phar/tests/zip/rmdir.phpt
@@ -15,6 +15,7 @@ $phar = new Phar($fname);
 $phar->setStub("<?php
 Phar::mapPhar('hio');
 __HALT_COMPILER(); ?>");
+$phar->addEmptyDir('a');
 $phar['a/x'] = 'a';
 $phar->stopBuffering();
 
@@ -31,7 +32,7 @@ var_dump(rmdir($alias . '/a'));
 --EXPECTF--
 a
 
-Warning: rmdir(): phar error: Directory not empty in %srmdir.php on line 16
+Warning: rmdir(): phar error: Directory not empty in %srmdir.php on line %d
 bool(false)
 a
 bool(true)