# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2007-07-05 18:39:03
# Node ID beb774707c527363d9dbb728460029dae192a66b
# Parent  7db38bfb307ea9e35e9a34226ac89e74d4fb9329

test-archive: stop checking md5 absolute values

Different tar/zlib versions can generate different binaries.

diff --git a/tests/test-archive b/tests/test-archive
--- a/tests/test-archive
+++ b/tests/test-archive
@@ -39,16 +39,22 @@ bunzip2 -dc test.tar.bz2 | tar tf -
 hg archive -t tgz -p %b-%h test-%h.tar.gz
 gzip -dc test-$QTIP.tar.gz | tar tf - | sed "s/$QTIP/TIP/"
 
-cat > md5check.py <<EOF
+cat > md5comp.py <<EOF
 import md5, sys
-print md5.md5(file(sys.argv[1], 'rb').read()).hexdigest()
+f1, f2 = sys.argv[1:3]
+h1 = md5.md5(file(f1, 'rb').read()).hexdigest()
+h2 = md5.md5(file(f2, 'rb').read()).hexdigest()
+print h1 == h2 or "md5 differ: " + repr((h1, h2))
 EOF
 
+# archive name is stored in the archive, so create similar
+# archives and rename them afterwards.
 hg archive -t tgz tip.tar.gz
-python md5check.py tip.tar.gz
+mv tip.tar.gz tip1.tar.gz
 sleep 1
 hg archive -t tgz tip.tar.gz
-python md5check.py tip.tar.gz
+mv tip.tar.gz tip2.tar.gz
+python md5comp.py tip1.tar.gz tip2.tar.gz
 
 hg archive -t zip -p /illegal test.zip
 hg archive -t zip -p very/../bad test.zip
diff --git a/tests/test-archive.out b/tests/test-archive.out
--- a/tests/test-archive.out
+++ b/tests/test-archive.out
@@ -26,8 +26,7 @@ test-TIP/.hg_archival.txt
 test-TIP/bar
 test-TIP/baz/bletch
 test-TIP/foo
-76ce33f5d5cf8151558e2d9a396c7504
-76ce33f5d5cf8151558e2d9a396c7504
+True
 abort: archive prefix contains illegal components
 Archive:  test.zip
     testing: test/.hg_archival.txt    OK