From b49301b5cd9ff43a7af0bd9054d9d1a328c0d212 Mon Sep 17 00:00:00 2001 From: kientzle Date: Wed, 20 Aug 2008 06:01:53 +0000 Subject: Better comment the pattern tests; adjust the filenames for the reference files to match the corresponding source. MFC after: 3 days --- usr.bin/tar/test/test_patterns.c | 28 +++++++++++++++++++--------- usr.bin/tar/test/test_patterns.tgz.err.uu | 6 ------ usr.bin/tar/test/test_patterns.tgz.out.uu | 5 ----- usr.bin/tar/test/test_patterns.tgz.uu | 9 --------- usr.bin/tar/test/test_patterns_2.tgz.err.uu | 6 ++++++ usr.bin/tar/test/test_patterns_2.tgz.out.uu | 5 +++++ usr.bin/tar/test/test_patterns_2.tgz.uu | 9 +++++++++ 7 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 usr.bin/tar/test/test_patterns.tgz.err.uu delete mode 100644 usr.bin/tar/test/test_patterns.tgz.out.uu delete mode 100644 usr.bin/tar/test/test_patterns.tgz.uu create mode 100644 usr.bin/tar/test/test_patterns_2.tgz.err.uu create mode 100644 usr.bin/tar/test/test_patterns_2.tgz.out.uu create mode 100644 usr.bin/tar/test/test_patterns_2.tgz.uu (limited to 'usr.bin/tar') diff --git a/usr.bin/tar/test/test_patterns.c b/usr.bin/tar/test/test_patterns.c index 9f77436..a90d711 100644 --- a/usr.bin/tar/test/test_patterns.c +++ b/usr.bin/tar/test/test_patterns.c @@ -28,15 +28,18 @@ __FBSDID("$FreeBSD$"); DEFINE_TEST(test_patterns) { int fd, r; - const char *reffile1 = "test_patterns.tgz"; - const char *reffile1_out = "test_patterns.tgz.out"; - const char *reffile1_err = "test_patterns.tgz.err"; + const char *reffile2 = "test_patterns_2.tgz"; + const char *reffile2_out = "test_patterns_2.tgz.out"; + const char *reffile2_err = "test_patterns_2.tgz.err"; /* * Test basic command-line pattern handling. */ /* + * Test 1: Files on the command line that don't get matched + * didn't produce an error. + * * John Baldwin reported this problem in PR bin/121598 */ fd = open("foo", O_CREAT | O_WRONLY, 0644); @@ -48,13 +51,20 @@ DEFINE_TEST(test_patterns) failure("tar should return non-zero because a file was given on the command line that's not in the archive"); assert(r != 0); - extract_reference_file(reffile1); - extract_reference_file(reffile1_out); - extract_reference_file(reffile1_err); + /* + * Test 2: Check basic matching of full paths that start with / + */ + extract_reference_file(reffile2); + extract_reference_file(reffile2_out); + extract_reference_file(reffile2_err); r = systemf("%s tf %s /tmp/foo/bar > tar2a.out 2> tar2a.err", - testprog, reffile1); + testprog, reffile2); assertEqualInt(r, 0); - assertEqualFile("tar2a.out", reffile1_out); - assertEqualFile("tar2a.err", reffile1_err); + assertEqualFile("tar2a.out", reffile2_out); + assertEqualFile("tar2a.err", reffile2_err); + + /* + * + */ } diff --git a/usr.bin/tar/test/test_patterns.tgz.err.uu b/usr.bin/tar/test/test_patterns.tgz.err.uu deleted file mode 100644 index 437d053..0000000 --- a/usr.bin/tar/test/test_patterns.tgz.err.uu +++ /dev/null @@ -1,6 +0,0 @@ -$FreeBSD$ -begin 644 test_patterns.tgz.err -M8G-D=&%R.B!296UO=FEN9R!L96%D:6YG("@H` -` -end diff --git a/usr.bin/tar/test/test_patterns.tgz.uu b/usr.bin/tar/test/test_patterns.tgz.uu deleted file mode 100644 index 50f61ed..0000000 --- a/usr.bin/tar/test/test_patterns.tgz.uu +++ /dev/null @@ -1,9 +0,0 @@ -$FreeBSD$ -begin 644 test_patterns.tgz -M'XL(`,P5I4@``^W3T0J",!3&<1]E;[!SYC:?Q\`H2`PS@IZ^F5AV(PFMJ__O -MYB@;>.:W8X?V;/==9XM\1*0*P:2J59"QCN8ZO:A*4*Z`]OR?\Y_C!7Y`P``````````````?.,! -(*>E$>P`H```` -` -end diff --git a/usr.bin/tar/test/test_patterns_2.tgz.err.uu b/usr.bin/tar/test/test_patterns_2.tgz.err.uu new file mode 100644 index 0000000..cb05930 --- /dev/null +++ b/usr.bin/tar/test/test_patterns_2.tgz.err.uu @@ -0,0 +1,6 @@ +$FreeBSD$ +begin 644 test_patterns_2.tgz.err +M8G-D=&%R.B!296UO=FEN9R!L96%D:6YG("@H` +` +end diff --git a/usr.bin/tar/test/test_patterns_2.tgz.uu b/usr.bin/tar/test/test_patterns_2.tgz.uu new file mode 100644 index 0000000..0f9c715 --- /dev/null +++ b/usr.bin/tar/test/test_patterns_2.tgz.uu @@ -0,0 +1,9 @@ +$FreeBSD$ +begin 644 test_patterns_2.tgz +M'XL(`,P5I4@``^W3T0J",!3&<1]E;[!SYC:?Q\`H2`PS@IZ^F5AV(PFMJ__O +MYB@;>.:W8X?V;/==9XM\1*0*P:2J59"QCN8ZO:A*4*Z`]OR?\Y_C!7Y`P``````````````?.,! +(*>E$>P`H```` +` +end -- cgit v1.1