diff options
| author | kientzle <kientzle@FreeBSD.org> | 2008-08-22 02:27:06 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2008-08-22 02:27:06 +0000 |
| commit | 23c403cbda90ba592397f8837ed4d31d8c6560e1 (patch) | |
| tree | 5440d07f412f8add150b86b232025b597225e655 /usr.bin/cpio/test/test_gcpio_compat.c | |
| parent | 2a48176eba96caaa3a31b0d353942f75bb2fbd49 (diff) | |
| download | FreeBSD-src-23c403cbda90ba592397f8837ed4d31d8c6560e1.zip FreeBSD-src-23c403cbda90ba592397f8837ed4d31d8c6560e1.tar.gz | |
Comment a couple of places where bsdcpio and gcpio 2.9 disagree.
The number of blocks read from ustar archives is just an implementation
difference. The failure of bsdcpio to emit a block count to stderr
in -p mode is a real bug in bsdcpio.
Diffstat (limited to 'usr.bin/cpio/test/test_gcpio_compat.c')
| -rw-r--r-- | usr.bin/cpio/test/test_gcpio_compat.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr.bin/cpio/test/test_gcpio_compat.c b/usr.bin/cpio/test/test_gcpio_compat.c index 4c69abb..4b97c82 100644 --- a/usr.bin/cpio/test/test_gcpio_compat.c +++ b/usr.bin/cpio/test/test_gcpio_compat.c @@ -48,6 +48,7 @@ unpack_test(const char *from, const char *options, const char *se) assertEqualInt(r, 0); /* Verify that nothing went to stderr. */ + failure("Error invoking %s -i %s < %s", testprog, options, from); assertFileContents(se, strlen(se), "unpack.err"); /* @@ -121,6 +122,7 @@ DEFINE_TEST(test_gcpio_compat) unpack_test("test_gcpio_compat_ref.bin", "", "1 block\n"); unpack_test("test_gcpio_compat_ref.crc", "", "2 blocks\n"); unpack_test("test_gcpio_compat_ref.newc", "", "2 blocks\n"); + /* gcpio-2.9 only reads 6 blocks here */ unpack_test("test_gcpio_compat_ref.ustar", "", "7 blocks\n"); umask(oldumask); |
