From 86e9359072ac5b11fe9eec17ad352ca39949be1a Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Tue, 10 Sep 2019 21:54:15 -0500 Subject: [PATCH] test-get: rm pax_global_header from git archive output git-archive now adds a pax_global_header, and while GNU tar suppresses it, some versions of tar don't, so remove it explicitly to avoid spurious test failures. Thanks to Greg Troxel for for reporting the problem and helping devise the solution. Signed-off-by: Rob Browning Tested-by: Rob Browning --- t/test-get | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/test-get b/t/test-get index 7590c77..41656ef 100755 --- a/t/test-get +++ b/t/test-get @@ -18,6 +18,7 @@ script_home = abspath(dirname(sys.argv[0] or '.')) sys.path[:0] = [abspath(script_home + '/../lib'), abspath(script_home + '/..')] from bup import compat +from bup.helpers import unlink from buptest import ex, exo, test_tempdir from wvtest import wvcheck, wvfail, wvmsg, wvpass, wvpasseq, wvpassne, wvstart @@ -108,6 +109,8 @@ def validate_tree(src_id, dest_id): if exr.rc != 0: return False # git archive doesn't include an entry for ./. + unlink('restore-src/pax_global_header') + unlink('restore-dest/pax_global_header') ex(('touch', '-r', 'restore-src', 'restore-dest')) verify_trees_match('restore-src/', 'restore-dest/') rmrf('restore-src') -- 2.39.2