Regression test for Issue 51: Verify that interpolating an empty mtree

archive doesn't generate a bogus error message.

SVN-Revision: 1732

diff --git a/Makefile.am b/Makefile.am
index b9b197874d733b96a0a45dc3507749ff1f9a5fcc..6c3ddc62b20a95c7dd4800a540327ef62b26e382 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -463,6 +463,7 @@ bsdtar_test_SOURCES=                                                \
        tar/test/test_0.c                                       \
        tar/test/test_basic.c                                   \
        tar/test/test_copy.c                                    \
+       tar/test/test_empty_mtree.c                             \
        tar/test/test_getdate.c                                 \
        tar/test/test_help.c                                    \
        tar/test/test_option_T_upper.c                          \

diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index fab67f3de6011f58dc3fa786dc8d152d15fb2190..6064e14240731f8c09ea92c0c53afdec3e6cb3cf 100644 (file)
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -11,6 +11,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
     test_0.c
     test_basic.c
     test_copy.c
+    test_empty_mtree.c
     test_getdate.c
     test_help.c
     test_option_T_upper.c

diff --git a/tar/test/test_empty_mtree.c b/tar/test/test_empty_mtree.c
new file mode 100644 (file)
index 0000000..6f8a5e9
--- /dev/null
+++ b/tar/test/test_empty_mtree.c
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 2003-2009 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$");
+
+/*
+ * Regression test:  We used to get a bogus error message when we
+ * asked tar to copy entries out of an empty archive.  See
+ * Issue 51 on libarchive.googlecode.com for details.
+ */
+DEFINE_TEST(test_empty_mtree)
+{
+       int r;
+
+       assertMakeFile("test1.mtree", 0777, "#mtree\n");
+
+       r = systemf("%s cf test1.tar @test1.mtree >test1.out 2>test1.err",
+           testprog);
+       failure("Error invoking %s cf", testprog);
+       assertEqualInt(r, 0);
+       assertEmptyFile("test1.out");
+       assertEmptyFile("test1.err");
+}