From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 10 Apr 2010 19:55:45 +0000 (-0400)
Subject: Simple test for tar -X
X-Git-Tag: v3.0.0a~1130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75e963d8d03c4626581a3050e3f6dea5780d1787;p=thirdparty%2Flibarchive.git

Simple test for tar -X

SVN-Revision: 2218
---

diff --git a/Makefile.am b/Makefile.am
index db7128ccc..8f8071ebe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -484,6 +484,7 @@ bsdtar_test_SOURCES=						\
 	tar/test/test_getdate.c					\
 	tar/test/test_help.c					\
 	tar/test/test_option_T_upper.c				\
+	tar/test/test_option_X_upper.c				\
 	tar/test/test_option_exclude.c				\
 	tar/test/test_option_q.c				\
 	tar/test/test_option_r.c				\
diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index 936164c9a..1b3e3d8bd 100644
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -15,6 +15,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
     test_getdate.c
     test_help.c
     test_option_T_upper.c
+    test_option_X_upper.c
     test_option_exclude.c
     test_option_q.c
     test_option_r.c
diff --git a/tar/test/test_option_X_upper.c b/tar/test/test_option_X_upper.c
new file mode 100644
index 000000000..5aedc5eca
--- /dev/null
+++ b/tar/test/test_option_X_upper.c
@@ -0,0 +1,68 @@
+/*-
+ * Copyright (c) 2010 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_X_upper)
+{
+	int r;
+
+	/*
+	 * Create a sample archive.
+	 */
+	assertMakeFile("file1", 0644, "file1");
+	assertMakeFile("file2", 0644, "file2");
+	assertEqualInt(0, systemf("%s -cf archive.tar file1 file2", testprog));
+
+	/*
+	 * Now, try extracting from the test archive with various -X usage.
+	 */
+
+	/* Test 1: Without -X */
+	assertMakeDir("test1", 0755);
+	assertChdir("test1");
+	r = systemf("%s -xf ../archive.tar >test.out 2>test.err",
+	    testprog);
+	if (!assertEqualInt(0, r))
+		return;
+
+	assertFileContents("file1", 5, "file1");
+	assertFileContents("file2", 5, "file2");
+	assertEmptyFile("test.out");
+	assertEmptyFile("test.err");
+	assertChdir("..");
+
+	/* Test 2: Use -X to skip one file */
+	assertMakeDir("test2", 0755);
+	assertChdir("test2");
+	assertMakeFile("exclusions", 0644, "file1\n");
+	assertEqualInt(0,
+	    systemf("%s -xf ../archive.tar -X exclusions >test.out 2>test.err", testprog));
+	assertFileNotExists("file1");
+	assertFileContents("file2", 5, "file2");
+	assertEmptyFile("test.out");
+	assertEmptyFile("test.err");
+	assertChdir("..");
+}