From: Tim Kientzle Date: Sun, 11 Apr 2010 23:36:59 +0000 (-0400) Subject: Test -H and -L options to tar. X-Git-Tag: v3.0.0a~1112 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6412fa4b39e64c08cbdb2519aee6288ad2346c07;p=thirdparty%2Flibarchive.git Test -H and -L options to tar. SVN-Revision: 2236 --- diff --git a/Makefile.am b/Makefile.am index 28b60c7e7..9208348f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -484,6 +484,8 @@ bsdtar_test_SOURCES= \ tar/test/test_getdate.c \ tar/test/test_help.c \ tar/test/test_option_C_upper.c \ + tar/test/test_option_H_upper.c \ + tar/test/test_option_L_upper.c \ tar/test/test_option_T_upper.c \ tar/test/test_option_X_upper.c \ tar/test/test_option_b.c \ diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt index 5ae3b6a8d..183e22ad6 100644 --- a/tar/test/CMakeLists.txt +++ b/tar/test/CMakeLists.txt @@ -15,6 +15,8 @@ IF(ENABLE_TAR AND ENABLE_TEST) test_getdate.c test_help.c test_option_C_upper.c + test_option_H_upper.c + test_option_L_upper.c test_option_T_upper.c test_option_X_upper.c test_option_exclude.c diff --git a/tar/test/test_option_H_upper.c b/tar/test/test_option_H_upper.c new file mode 100644 index 000000000..7ddd917b7 --- /dev/null +++ b/tar/test/test_option_H_upper.c @@ -0,0 +1,92 @@ +/*- + * 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_H_upper) +{ + + if (!canSymlink()) { + skipping("Can't test symlinks on this filesystem"); + return; + } + + /* + * Create a sample archive. + */ + assertMakeDir("in", 0755); + assertChdir("in"); + assertMakeDir("d1", 0755); + assertMakeSymlink("ld1", "d1"); + assertMakeFile("d1/file1", 0644, "d1/file1"); + assertMakeFile("d1/file2", 0644, "d1/file2"); + assertMakeSymlink("d1/link1", "file1"); + assertMakeSymlink("d1/linkX", "fileX"); + assertMakeSymlink("link2", "d1/file2"); + assertMakeSymlink("linkY", "d1/fileY"); + assertChdir(".."); + + /* Test 1: Without -H */ + assertMakeDir("test1", 0755); + assertEqualInt(0, + systemf("%s -cf test1/archive.tar -C in . >test1/c.out 2>test1/c.err", testprog)); + assertChdir("test1"); + assertEqualInt(0, + systemf("%s -xf archive.tar >c.out 2>c.err", testprog)); + assertIsSymlink("ld1", "d1"); + assertIsSymlink("d1/link1", "file1"); + assertIsSymlink("d1/linkX", "fileX"); + assertIsSymlink("link2", "d1/file2"); + assertIsSymlink("linkY", "d1/fileY"); + assertChdir(".."); + + /* Test 2: With -H, no symlink on command line. */ + assertMakeDir("test2", 0755); + assertEqualInt(0, + systemf("%s -cf test2/archive.tar -H -C in . >test2/c.out 2>test2/c.err", testprog)); + assertChdir("test2"); + assertEqualInt(0, + systemf("%s -xf archive.tar >c.out 2>c.err", testprog)); + assertIsSymlink("ld1", "d1"); + assertIsSymlink("d1/link1", "file1"); + assertIsSymlink("d1/linkX", "fileX"); + assertIsSymlink("link2", "d1/file2"); + assertIsSymlink("linkY", "d1/fileY"); + assertChdir(".."); + + /* Test 3: With -H, some symlinks on command line. */ + assertMakeDir("test3", 0755); + assertEqualInt(0, + systemf("%s -cf test3/archive.tar -H -C in ld1 d1 link2 linkY >test2/c.out 2>test2/c.err", testprog)); + assertChdir("test3"); + assertEqualInt(0, + systemf("%s -xf archive.tar >c.out 2>c.err", testprog)); + assertIsDir("ld1", 0755); + assertIsSymlink("d1/linkX", "fileX"); + assertIsSymlink("d1/link1", "file1"); + assertIsReg("link2", 0644); + assertIsSymlink("linkY", "d1/fileY"); + assertChdir(".."); +} diff --git a/tar/test/test_option_L_upper.c b/tar/test/test_option_L_upper.c new file mode 100644 index 000000000..57abe412c --- /dev/null +++ b/tar/test/test_option_L_upper.c @@ -0,0 +1,92 @@ +/*- + * 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_L_upper) +{ + + if (!canSymlink()) { + skipping("Can't test symlinks on this filesystem"); + return; + } + + /* + * Create a sample archive. + */ + assertMakeDir("in", 0755); + assertChdir("in"); + assertMakeDir("d1", 0755); + assertMakeSymlink("ld1", "d1"); + assertMakeFile("d1/file1", 0644, "d1/file1"); + assertMakeFile("d1/file2", 0644, "d1/file2"); + assertMakeSymlink("d1/link1", "file1"); + assertMakeSymlink("d1/linkX", "fileX"); + assertMakeSymlink("link2", "d1/file2"); + assertMakeSymlink("linkY", "d1/fileY"); + assertChdir(".."); + + /* Test 1: Without -L */ + assertMakeDir("test1", 0755); + assertEqualInt(0, + systemf("%s -cf test1/archive.tar -C in . >test1/c.out 2>test1/c.err", testprog)); + assertChdir("test1"); + assertEqualInt(0, + systemf("%s -xf archive.tar >c.out 2>c.err", testprog)); + assertIsSymlink("ld1", "d1"); + assertIsSymlink("d1/link1", "file1"); + assertIsSymlink("d1/linkX", "fileX"); + assertIsSymlink("link2", "d1/file2"); + assertIsSymlink("linkY", "d1/fileY"); + assertChdir(".."); + + /* Test 2: With -L, no symlink on command line. */ + assertMakeDir("test2", 0755); + assertEqualInt(0, + systemf("%s -cf test2/archive.tar -L -C in . >test2/c.out 2>test2/c.err", testprog)); + assertChdir("test2"); + assertEqualInt(0, + systemf("%s -xf archive.tar >c.out 2>c.err", testprog)); + assertIsDir("ld1", 0755); + assertIsReg("d1/link1", 0644); + assertIsSymlink("d1/linkX", "fileX"); + assertIsReg("link2", 0644); + assertIsSymlink("linkY", "d1/fileY"); + assertChdir(".."); + + /* Test 3: With -L, some symlinks on command line. */ + assertMakeDir("test3", 0755); + assertEqualInt(0, + systemf("%s -cf test3/archive.tar -L -C in ld1 d1 link2 linkY >test2/c.out 2>test2/c.err", testprog)); + assertChdir("test3"); + assertEqualInt(0, + systemf("%s -xf archive.tar >c.out 2>c.err", testprog)); + assertIsDir("ld1", 0755); + assertIsReg("d1/link1", 0644); + assertIsSymlink("d1/linkX", "fileX"); + assertIsReg("link2", 0644); + assertIsSymlink("linkY", "d1/fileY"); + assertChdir(".."); +}