MFB: fix faulty tests

diff --git a/ext/phar/tests/tar/rmdir.phpt b/ext/phar/tests/tar/rmdir.phpt
index d08e5216145b7c5c1c1741e0875d8fdb82af2a3b..be037823d657170bddde3089de86dbd067e1512f 100644 (file)
--- 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 149f0e8d6b576a3765c197d81e1ff3f4e97bdd72..c7ef9dacacd75d7932695951aebd5e0122055bd1 100644 (file)
--- 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)