From 18a8e44baae292971d6ca47ba8d6a95545c668f9 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 5 Jun 2020 18:25:00 +0100 Subject: tests: Fix test failure with newer git versions that create more files When comparing the repository file list with the expected list, ignore objects/pack/pack-*.bitmap (created by default since 2.22) and objects/info/commit-graph (created by default since 2.24). --- tests/git-backup-on-error-multiple-backups.script | 2 ++ tests/git-backup-on-error-single-backup.script | 2 ++ 2 files changed, 4 insertions(+) (limited to 'tests') diff --git a/tests/git-backup-on-error-multiple-backups.script b/tests/git-backup-on-error-multiple-backups.script index bcc165b..af67879 100755 --- a/tests/git-backup-on-error-multiple-backups.script +++ b/tests/git-backup-on-error-multiple-backups.script @@ -32,6 +32,8 @@ normalize() { -e "s|git-post-fail-$DATETIMESPEC|git-post-fail-DATETIME|g" \ -e "s/pack-[0-9a-z]+\.(idx|pack)$/pack-file/" \ -e '/hooks\/.*\.sample/d' \ + -e "/\/objects\/info\/commit-graph$/d" \ + -e "/\/objects\/pack\/pack-[0-9a-z]+\.bitmap$/d" \ -e "s|$DATADIR|DATADIR|g" "$@" } diff --git a/tests/git-backup-on-error-single-backup.script b/tests/git-backup-on-error-single-backup.script index 23d0f36..40ec12a 100755 --- a/tests/git-backup-on-error-single-backup.script +++ b/tests/git-backup-on-error-single-backup.script @@ -31,6 +31,8 @@ postbackup="$workdir/$repo_name/git-post-fail" normalize() { sed -r -e '/hooks\/.*\.sample/d' \ -e "s/pack-[0-9a-z]+\.(idx|pack)$/pack-file/" \ + -e "/\/objects\/info\/commit-graph$/d" \ + -e "/\/objects\/pack\/pack-[0-9a-z]+\.bitmap$/d" \ -e "s|$DATADIR|DATADIR|g" "$@" } -- cgit v1.2.1