diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2023-06-14 23:47:03 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2023-06-14 23:47:03 +0100 |
| commit | 9364f9bc82636734802e72d5c9e7287652e9b413 (patch) | |
| tree | dc0da790c58f7ddbffb761439bf08e584b70958f /tests/tests/tagupl | |
| parent | 72690fea191e541fda427477063ca6e599133168 (diff) | |
tests/tagupl: Cope with git 2.40 restriction
Again, skip the test if we can't repro this.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/tagupl')
| -rwxr-xr-x | tests/tests/tagupl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/tests/tagupl b/tests/tests/tagupl index c70583e..3bb683d 100755 --- a/tests/tests/tagupl +++ b/tests/tests/tagupl @@ -178,8 +178,16 @@ perl -pe <../raw-base ' ' >../tagobj-$ident echo >>../tagobj-$ident cat ../basetag >>../tagobj-$ident -raw-mangled -grep 'failed to fish tagger out of tag' ../tagupl/overall.log +set +e +(set -e; LC_MESSAGES=C raw-mangled 2>../mktag.err) +rc=$? +set -e +if [ $rc = 0 ]; then + grep 'failed to fish tagger out of tag' ../tagupl/overall.log +elif [ $rc = 128 ] && egrep 'error: object fails fsck: badTimezone: invalid author/committer line - bad time zone' ../mktag.err; then : +else + fatal 'failed to make raw-mangled' +fi cd .. rm -rf $p |