From owner-svn-src-all@freebsd.org Thu Mar 2 22:46:05 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D2C6CF6A94; Thu, 2 Mar 2017 22:46:05 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0EE5D10A6; Thu, 2 Mar 2017 22:46:04 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v22Mk4Cn026338; Thu, 2 Mar 2017 22:46:04 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v22Mk4Qv026337; Thu, 2 Mar 2017 22:46:04 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201703022246.v22Mk4Qv026337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Thu, 2 Mar 2017 22:46:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r314570 - vendor/libarchive/dist/tar/test X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 22:46:05 -0000 Author: mm Date: Thu Mar 2 22:46:03 2017 New Revision: 314570 URL: https://svnweb.freebsd.org/changeset/base/314570 Log: Update vendor/libarchive to git f4b9b3fe89b4acfef5e3a2283d3bc542315ddb57 Fixes for test_options_fflags tar test Modified: vendor/libarchive/dist/tar/test/test_option_fflags.c Modified: vendor/libarchive/dist/tar/test/test_option_fflags.c ============================================================================== --- vendor/libarchive/dist/tar/test/test_option_fflags.c Thu Mar 2 22:42:59 2017 (r314569) +++ vendor/libarchive/dist/tar/test/test_option_fflags.c Thu Mar 2 22:46:03 2017 (r314570) @@ -25,6 +25,31 @@ #include "test.h" __FBSDID("$FreeBSD$"); +static void +clear_fflags(const char *pathname) +{ +#if defined(HAVE_STRUCT_STAT_ST_FLAGS) + chflags(pathname, 0); +#elif (defined(FS_IOC_GETFLAGS) && defined(HAVE_WORKING_FS_IOC_GETFLAGS)) || \ + (defined(EXT2_IOC_GETFLAGS) && defined(HAVE_WORKING_EXT2_IOC_GETFLAGS)) + int fd; + + fd = open(pathname, O_RDONLY | O_NONBLOCK); + if (fd < 0) + return; + ioctl(fd, +#ifdef FS_IOC_GETFLAGS + FS_IOC_GETFLAGS, +#else + EXT2_IOC_GETFLAGS, +#endif + 0); +#else + (void)pathname; /* UNUSED */ +#endif + return; +} + DEFINE_TEST(test_option_fflags) { int r; @@ -40,6 +65,9 @@ DEFINE_TEST(test_option_fflags) /* Set nodump flag on the file */ assertSetNodump("f"); + /* FreeBSD ZFS workaround: ZFS sets uarch on all touched files and dirs */ + chmod("f", 0644); + /* Archive it with fflags */ r = systemf("%s -c --fflags -f fflags.tar f >fflags.out 2>fflags.err", testprog); assertEqualInt(r, 0); @@ -50,24 +78,28 @@ DEFINE_TEST(test_option_fflags) /* Extract fflags with fflags */ assertMakeDir("fflags_fflags", 0755); + clear_fflags("fflags_fflags"); r = systemf("%s -x -C fflags_fflags --no-same-permissions --fflags -f fflags.tar >fflags_fflags.out 2>fflags_fflags.err", testprog); assertEqualInt(r, 0); assertEqualFflags("f", "fflags_fflags/f"); /* Extract fflags without fflags */ assertMakeDir("fflags_nofflags", 0755); + clear_fflags("fflags_nofflags"); r = systemf("%s -x -C fflags_nofflags -p --no-fflags -f fflags.tar >fflags_nofflags.out 2>fflags_nofflags.err", testprog); assertEqualInt(r, 0); assertUnequalFflags("f", "fflags_nofflags/f"); /* Extract nofflags with fflags */ assertMakeDir("nofflags_fflags", 0755); + clear_fflags("nofflags_fflags"); r = systemf("%s -x -C nofflags_fflags --no-same-permissions --fflags -f nofflags.tar >nofflags_fflags.out 2>nofflags_fflags.err", testprog); assertEqualInt(r, 0); assertUnequalFflags("f", "nofflags_fflags/f"); /* Extract nofflags with nofflags */ assertMakeDir("nofflags_nofflags", 0755); + clear_fflags("nofflags_nofflags"); r = systemf("%s -x -C nofflags_nofflags -p --no-fflags -f nofflags.tar >nofflags_nofflags.out 2>nofflags_nofflags.err", testprog); assertEqualInt(r, 0); assertUnequalFflags("f", "nofflags_nofflags/f");