From 2942879b6ed0f413f59c085747271ea20b06e8f1 Mon Sep 17 00:00:00 2001
From: mm <mm@FreeBSD.org>
Date: Thu, 22 Dec 2011 08:42:07 +0000
Subject: Use contrib sources for building libarchive, tar and cpio. Make "make
 test" fully operational.

MFC after:	2 weeks
---
 usr.bin/cpio/test/test_gcpio_compat.c | 108 ----------------------------------
 1 file changed, 108 deletions(-)
 delete mode 100644 usr.bin/cpio/test/test_gcpio_compat.c

(limited to 'usr.bin/cpio/test/test_gcpio_compat.c')

diff --git a/usr.bin/cpio/test/test_gcpio_compat.c b/usr.bin/cpio/test/test_gcpio_compat.c
deleted file mode 100644
index 3d992c4..0000000
--- a/usr.bin/cpio/test/test_gcpio_compat.c
+++ /dev/null
@@ -1,108 +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$");
-
-static void
-unpack_test(const char *from, const char *options, const char *se)
-{
-	int r;
-
-	/* Create a work dir named after the file we're unpacking. */
-	assertMakeDir(from, 0775);
-	assertChdir(from);
-
-	/*
-	 * Use cpio to unpack the sample archive
-	 */
-	extract_reference_file(from);
-	r = systemf("%s -i %s < %s >unpack.out 2>unpack.err",
-	    testprog, options, from);
-	failure("Error invoking %s -i %s < %s",
-	    testprog, options, from);
-	assertEqualInt(r, 0);
-
-	/* Verify that nothing went to stderr. */
-	if (canSymlink()) {
-		failure("Error invoking %s -i %s < %s",
-		    testprog, options, from);
-		assertTextFileContents(se, "unpack.err");
-	}
-
-	/*
-	 * Verify unpacked files.
-	 */
-
-	/* Regular file with 2 links. */
-	assertIsReg("file", 0644);
-	failure("%s", from);
-	assertFileSize("file", 10);
-	assertFileSize("linkfile", 10);
-	failure("%s", from);
-	assertFileNLinks("file", 2);
-
-	/* Another name for the same file. */
-	failure("%s", from);
-	assertIsHardlink("linkfile", "file");
-	assertFileSize("file", 10);
-	assertFileSize("linkfile", 10);
-
-	/* Symlink */
-	if (canSymlink())
-		assertIsSymlink("symlink", "file");
-
-	/* dir */
-	assertIsDir("dir", 0775);
-
-	assertChdir("..");
-}
-
-DEFINE_TEST(test_gcpio_compat)
-{
-	assertUmask(0);
-
-	/* Dearchive sample files with a variety of options. */
-	if (canSymlink()) {
-		unpack_test("test_gcpio_compat_ref.bin",
-		    "--no-preserve-owner", "1 block\n");
-		unpack_test("test_gcpio_compat_ref.crc",
-		    "--no-preserve-owner", "2 blocks\n");
-		unpack_test("test_gcpio_compat_ref.newc",
-		    "--no-preserve-owner", "2 blocks\n");
-		/* gcpio-2.9 only reads 6 blocks here */
-		unpack_test("test_gcpio_compat_ref.ustar",
-		    "--no-preserve-owner", "7 blocks\n");
-	} else {
-		unpack_test("test_gcpio_compat_ref_nosym.bin",
-		    "--no-preserve-owner", "1 block\n");
-		unpack_test("test_gcpio_compat_ref_nosym.crc",
-		    "--no-preserve-owner", "2 blocks\n");
-		unpack_test("test_gcpio_compat_ref_nosym.newc",
-		    "--no-preserve-owner", "2 blocks\n");
-		/* gcpio-2.9 only reads 6 blocks here */
-		unpack_test("test_gcpio_compat_ref_nosym.ustar",
-		    "--no-preserve-owner", "7 blocks\n");
-	}
-}
-- 
cgit v1.1