From b1feec2392ccb4abbd55b9c81a448adcdcf0d3fd Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Thu, 21 Aug 2008 22:28:00 +0000 Subject: [PATCH] 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. --- usr.bin/tar/test/test_patterns.c | 6 +++--- usr.bin/tar/test/test_patterns_2.tgz.out.uu | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 usr.bin/tar/test/test_patterns_2.tgz.out.uu diff --git a/usr.bin/tar/test/test_patterns.c b/usr.bin/tar/test/test_patterns.c index 4707dac42c0..281133aa4c0 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 1c7f0927813..00000000000 --- 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