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 <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/t/test-get b/t/test-get
index 7590c776b82378efcab4f44100d4b81cb1babe84..41656ef7b0f7da15e5fb48fd6b5691878d8d4c82 100755 (executable)
--- 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')