use a tar generated by the tar command to test links. Test still fails

diff --git a/ext/phar/tests/tar/files/links.tar b/ext/phar/tests/tar/files/links.tar
new file mode 100644 (file)
index 0000000..6cd22df
Binary files /dev/null and b/ext/phar/tests/tar/files/links.tar differ

diff --git a/ext/phar/tests/tar/links.phpt b/ext/phar/tests/tar/links.phpt
index f1201a62091bfb9006ded69ab843ceae4c7491ef..2e0fdcbf65c295552a16ef2023ff25676740735e 100644 (file)
--- a/ext/phar/tests/tar/links.phpt
+++ b/ext/phar/tests/tar/links.phpt
@@ -4,37 +4,14 @@ Phar: tar with hard link and symbolic link
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 --FILE--
 <?php
-$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
-$pname = 'phar://' . $fname;
-
-include dirname(__FILE__) . '/files/corrupt_tarmaker.php.inc';
-$a = new corrupt_tarmaker($fname, 'none');
-$a->init();
-$a->addFile('symlink', 'internal/file.txt', array(
-                    'mode' => 0xA000 + 0644,
-                    'uid' => 0,
-                    'gid' => 0,
-                    'size' => strlen('internal/file.txt'),
-                    'mtime' => time(),
-                ), 'symlink');
-$a->addFile('hardlink', 'internal/file.txt', array(
-                    'mode' => 0xA000 + 0644,
-                    'uid' => 0,
-                    'gid' => 0,
-                    'size' => strlen('internal/file.txt'),
-                    'mtime' => time(),
-                ));
-$a->addFile('internal/file.txt', 'hi there');
-$a->close();
-
 try {
-       $p = new PharData($fname);
+       $p = new PharData(dirname(__FILE__) . '/files/links.tar');
 } catch (Exception $e) {
        echo $e->getMessage() . "\n";
 }
-var_dump($p['symlink']->getContent());
-var_dump($p['hardlink']->getContent());
-var_dump($p['internal/file.txt']->getContent());
+var_dump($p['testit/link']->getContent());
+var_dump($p['testit/hard']->getContent());
+var_dump($p['testit/file']->getContent());
 ?>
 ===DONE===
 --CLEAN--
@@ -42,7 +19,7 @@ var_dump($p['internal/file.txt']->getContent());
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar');
 ?>
 --EXPECTF--
-string(17) "internal/file.txt"
-string(17) "internal/file.txt"
-string(8) "hi there"
+string(2) "hi"
+string(2) "hi"
+string(2) "hi"
 ===DONE===