Add a test for bsdtar --xz option.

diff --git a/Makefile.am b/Makefile.am
index aa0aec9a667396d724c88788c9cf225e31e6e840..35badf1e383e17db36da6fe8debe6e5a12079a69 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -735,6 +735,7 @@ bsdtar_test_SOURCES=                                                \
        tar/test/test_option_r.c                                \
        tar/test/test_option_s.c                                \
        tar/test/test_option_uid_uname.c                        \
+       tar/test/test_option_xz.c                               \
        tar/test/test_patterns.c                                \
        tar/test/test_print_longpath.c                          \
        tar/test/test_stdio.c                                   \
@@ -853,6 +854,7 @@ bsdcpio_test_SOURCES=                                               \
        cpio/test/test_option_t.c                               \
        cpio/test/test_option_u.c                               \
        cpio/test/test_option_version.c                         \
+       cpio/test/test_option_xz.c                              \
        cpio/test/test_option_y.c                               \
        cpio/test/test_option_z.c                               \
        cpio/test/test_owner_parse.c                            \

diff --git a/cpio/test/CMakeLists.txt b/cpio/test/CMakeLists.txt
index 30aa9766e21bf6a1e23d7186ce8618efa2630274..d67856e6c142a8e5975a38f2674bfd3c52e2b0a1 100644 (file)
--- a/cpio/test/CMakeLists.txt
+++ b/cpio/test/CMakeLists.txt
@@ -33,6 +33,7 @@ IF(ENABLE_CPIO AND ENABLE_TEST)
     test_option_t.c
     test_option_u.c
     test_option_version.c
+    test_option_xz.c
     test_option_y.c
     test_option_z.c
     test_owner_parse.c

diff --git a/cpio/test/test_option_xz.c b/cpio/test/test_option_xz.c
new file mode 100644 (file)
index 0000000..02b5dfa
--- /dev/null
+++ b/cpio/test/test_option_xz.c
@@ -0,0 +1,57 @@
+/*-
+ * 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_xz)
+{
+       char *p;
+       int r;
+       size_t s;
+
+       /* Create a file. */
+       assertMakeFile("f", 0644, "a");
+
+       /* Archive it with xz compression. */
+       r = systemf("echo f | %s -o --xz >archive.out 2>archive.err",
+           testprog);
+       p = slurpfile(&s, "archive.err");
+       p[s] = '\0';
+       if (r != 0) {
+               if (strstr(p, "compression not available") != NULL) {
+                       skipping("This version of bsdcpio was compiled "
+                           "without xz support");
+                       return;
+               }
+               failure("--xz option is broken");
+               assertEqualInt(r, 0);
+               return;
+       }
+       /* Check that the archive file has an xz signature. */
+       p = slurpfile(&s, "archive.out");
+       assert(s > 2);
+       assertEqualMem(p, "\xFD\x37\x7A\x58\x5A\x00", 6);
+}

diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index 8cd4832abc7d43df5c38d5b380f97c1cdd9b2bbf..1347ef139a805713f932c20a31e080f7b378442c 100644 (file)
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -42,6 +42,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
     test_option_r.c
     test_option_s.c
     test_option_uid_uname.c
+    test_option_xz.c
     test_patterns.c
     test_print_longpath.c
     test_stdio.c

diff --git a/tar/test/test_option_xz.c b/tar/test/test_option_xz.c
new file mode 100644 (file)
index 0000000..0ad9053
--- /dev/null
+++ b/tar/test/test_option_xz.c
@@ -0,0 +1,57 @@
+/*-
+ * 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_xz)
+{
+       char *p;
+       int r;
+       size_t s;
+
+       /* Create a file. */
+       assertMakeFile("f", 0644, "a");
+
+       /* Archive it with xz compression. */
+       r = systemf("%s -cf - --xz f >archive.out 2>archive.err",
+           testprog);
+       p = slurpfile(&s, "archive.err");
+       p[s] = '\0';
+       if (r != 0) {
+               if (strstr(p, "compression not available") != NULL) {
+                       skipping("This version of bsdcpio was compiled "
+                           "without xz support");
+                       return;
+               }
+               failure("--xz option is broken");
+               assertEqualInt(r, 0);
+               return;
+       }
+       /* Check that the archive file has an xz signature. */
+       p = slurpfile(&s, "archive.out");
+       assert(s > 2);
+       assertEqualMem(p, "\xFD\x37\x7A\x58\x5A\x00", 6);
+}