Use contrib sources for building libarchive, tar and cpio.

Make "make test" fully operational.

MFC after:	2 weeks

1 files changed, 0 insertions, 129 deletions

diff --git a/usr.bin/tar/test/test_option_q.c b/usr.bin/tar/test/test_option_q.c
deleted file mode 100644
index c8e95400dfe4..000000000000
--- a/usr.bin/tar/test/test_option_q.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*-
- * Copyright (c) 2003-2007 Tim Kientzle
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "test.h"
-__FBSDID("$FreeBSD$");
-
-DEFINE_TEST(test_option_q)
-{
-	FILE *f;
-	int r;
-
-	/*
-	 * Create an archive with several different versions of the
-	 * same files.  By default, the last version will overwrite
-	 * any earlier versions.  The -q/--fast-read option will
-	 * stop early, so we can verify -q/--fast-read by seeing
-	 * which version of each file actually ended up being
-	 * extracted.  This also exercises -r mode, since that's
-	 * what we use to build up the test archive.
-	 */
-
-	f = fopen("foo", "w");
-	assert(f != NULL);
-	fprintf(f, "foo1");
-	fclose(f);
-
-	assertEqualInt(0, systemf("%s -cf archive.tar foo", testprog));
-
-	f = fopen("foo", "w");
-	assert(f != NULL);
-	fprintf(f, "foo2");
-	fclose(f);
-
-	assertEqualInt(0, systemf("%s -rf archive.tar foo", testprog));
-
-	f = fopen("bar", "w");
-	assert(f != NULL);
-	fprintf(f, "bar1");
-	fclose(f);
-
-	assertEqualInt(0, systemf("%s -rf archive.tar bar", testprog));
-
-	f = fopen("foo", "w");
-	assert(f != NULL);
-	fprintf(f, "foo3");
-	fclose(f);
-
-	assertEqualInt(0, systemf("%s -rf archive.tar foo", testprog));
-
-	f = fopen("bar", "w");
-	assert(f != NULL);
-	fprintf(f, "bar2");
-	fclose(f);
-
-	assertEqualInt(0, systemf("%s -rf archive.tar bar", testprog));
-
-	/*
-	 * Now, try extracting from the test archive with various
-	 * combinations of -q.
-	 */
-
-	/* Test 1: -q foo should only extract the first foo. */
-	assertMakeDir("test1", 0755);
-	assertChdir("test1");
-	r = systemf("%s -xf ../archive.tar -q foo >test.out 2>test.err",
-	    testprog);
-	failure("Fatal error trying to use -q option");
-	if (!assertEqualInt(0, r))
-		return;
-
-	assertFileContents("foo1", 4, "foo");
-	assertEmptyFile("test.out");
-	assertEmptyFile("test.err");
-	assertChdir("..");
-
-	/* Test 2: -q foo bar should extract up to the first bar. */
-	assertMakeDir("test2", 0755);
-	assertChdir("test2");
-	assertEqualInt(0,
-	    systemf("%s -xf ../archive.tar -q foo bar >test.out 2>test.err", testprog));
-	assertFileContents("foo2", 4, "foo");
-	assertFileContents("bar1", 4, "bar");
-	assertEmptyFile("test.out");
-	assertEmptyFile("test.err");
-	assertChdir("..");
-
-	/* Test 3: Same as test 2, but use --fast-read spelling. */
-	assertMakeDir("test3", 0755);
-	assertChdir("test3");
-	assertEqualInt(0,
-	    systemf("%s -xf ../archive.tar --fast-read foo bar >test.out 2>test.err", testprog));
-	assertFileContents("foo2", 4, "foo");
-	assertFileContents("bar1", 4, "bar");
-	assertEmptyFile("test.out");
-	assertEmptyFile("test.err");
-	assertChdir("..");
-
-	/* Test 4: Without -q, should extract everything. */
-	assertMakeDir("test4", 0755);
-	assertChdir("test4");
-	assertEqualInt(0,
-	    systemf("%s -xf ../archive.tar foo bar >test.out 2>test.err", testprog));
-	assertFileContents("foo3", 4, "foo");
-	assertFileContents("bar2", 4, "bar");
-	assertEmptyFile("test.out");
-	assertEmptyFile("test.err");
-	assertChdir("..");
-}