From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Tue, 16 Oct 2012 01:33:43 +0000 (+0900)
Subject: Add test_option_j to the bsdtar_test.
X-Git-Tag: v3.1.0~40^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e72feb0a83775f5ea81d4568ff9d5bf8b1b4c6e8;p=thirdparty%2Flibarchive.git

Add test_option_j to the bsdtar_test.
---

diff --git a/Makefile.am b/Makefile.am
index 751b674f3..7d42fc3ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -741,6 +741,7 @@ bsdtar_test_SOURCES=						\
 	tar/test/test_option_exclude.c				\
 	tar/test/test_option_gid_gname.c			\
 	tar/test/test_option_grzip.c				\
+	tar/test/test_option_j.c				\
 	tar/test/test_option_k.c				\
 	tar/test/test_option_keep_newer_files.c			\
 	tar/test/test_option_lrzip.c				\
diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index f686fc807..a51dbbaa3 100644
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -35,6 +35,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
     test_option_exclude.c
     test_option_gid_gname.c
     test_option_grzip.c
+    test_option_j.c
     test_option_k.c
     test_option_keep_newer_files.c
     test_option_lrzip.c
diff --git a/tar/test/test_option_j.c b/tar/test/test_option_j.c
new file mode 100644
index 000000000..3202c3b83
--- /dev/null
+++ b/tar/test/test_option_j.c
@@ -0,0 +1,56 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * Copyright (c) 2012 Michihiro NAKAJIMA
+ * 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_j)
+{
+	char *p;
+	int r;
+	size_t s;
+
+	/* Create a file. */
+	assertMakeFile("f", 0644, "a");
+
+	/* Archive it with bzip2 compression. */
+	r = systemf("%s -jcf archive.out f 2>archive.err", testprog);
+	p = slurpfile(&s, "archive.err");
+	p[s] = '\0';
+	if (r != 0) {
+		if (!canBzip2()) {
+			skipping("bzip2 is not supported on this platform");
+			return;
+		}
+		failure("-j option is broken");
+		assertEqualInt(r, 0);
+		return;
+	}
+	assertEmptyFile("archive.err");
+	/* Check that the archive file has a bzip2 signature. */
+	p = slurpfile(&s, "archive.out");
+	assert(s > 2);
+	assertEqualMem(p, "BZh9", 4);
+}