summaryrefslogtreecommitdiffstats
path: root/usr.bin/tar
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2008-08-21 22:28:00 +0000
committerkientzle <kientzle@FreeBSD.org>2008-08-21 22:28:00 +0000
commita348ba0da673fbd1251856d9927398c97cb0f5d2 (patch)
treee33264f59f2e30b2219f200ac94adbdfe96b0ec1 /usr.bin/tar
parent99279ce7b76fbbb137462307dd66ce99defbbd6b (diff)
downloadFreeBSD-src-a348ba0da673fbd1251856d9927398c97cb0f5d2.zip
FreeBSD-src-a348ba0da673fbd1251856d9927398c97cb0f5d2.tar.gz
The results for test 2 here are short enough to just be included inline.
There's no need to go through the hassle of having a checked-in uuencoded reference file for comparison.
Diffstat (limited to 'usr.bin/tar')
-rw-r--r--usr.bin/tar/test/test_patterns.c6
-rw-r--r--usr.bin/tar/test/test_patterns_2.tgz.out.uu5
2 files changed, 3 insertions, 8 deletions
diff --git a/usr.bin/tar/test/test_patterns.c b/usr.bin/tar/test/test_patterns.c
index 4707dac..281133a 100644
--- a/usr.bin/tar/test/test_patterns.c
+++ b/usr.bin/tar/test/test_patterns.c
@@ -29,8 +29,8 @@ DEFINE_TEST(test_patterns)
{
int fd, r;
const char *reffile2 = "test_patterns_2.tgz";
- const char *reffile2_out = "test_patterns_2.tgz.out";
const char *reffile3 = "test_patterns_3.tgz";
+ const char *p;
/*
* Test basic command-line pattern handling.
@@ -55,12 +55,12 @@ DEFINE_TEST(test_patterns)
* Test 2: Check basic matching of full paths that start with /
*/
extract_reference_file(reffile2);
- extract_reference_file(reffile2_out);
r = systemf("%s tf %s /tmp/foo/bar > tar2a.out 2> tar2a.err",
testprog, reffile2);
assertEqualInt(r, 0);
- assertEqualFile("tar2a.out", reffile2_out);
+ p = "/tmp/foo/bar/\n/tmp/foo/bar/baz\n";
+ assertFileContents(p, strlen(p), "tar2a.out");
assertEmptyFile("tar2a.err");
/*
diff --git a/usr.bin/tar/test/test_patterns_2.tgz.out.uu b/usr.bin/tar/test/test_patterns_2.tgz.out.uu
deleted file mode 100644
index 1c7f092..0000000
--- a/usr.bin/tar/test/test_patterns_2.tgz.out.uu
+++ /dev/null
@@ -1,5 +0,0 @@
-$FreeBSD$
-begin 644 test_patterns_2.tgz.out
-?+W1M<"]F;V\O8F%R+PHO=&UP+V9O;R]B87(O8F%Z"@``
-`
-end
OpenPOWER on IntegriCloud