fix cds test
- use $PERL instead of perl - use $DIFF instead of cmp for windows portability; cmp doesn't handle CR characters properly
This commit is contained in:
@@ -9,13 +9,17 @@
|
||||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
$target = shift;
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
my $target = shift;
|
||||
my $notbefore;
|
||||
my $inception;
|
||||
while (<>) {
|
||||
$notbefore = $1 if m{^.* must not be signed before \d+ [(](\d+)[)]$};
|
||||
$inception = $1 if m{^.* inception time \d+ [(](\d+)[)]$};
|
||||
$notbefore = $1 if m{^.* must not be signed before \d+ [(](\d+)[)]};
|
||||
$inception = $1 if m{^.* inception time \d+ [(](\d+)[)]};
|
||||
}
|
||||
die "missing notbefore time" unless $notbefore;
|
||||
die "missing inception time" unless $inception;
|
||||
my $delta = $inception - $notbefore;
|
||||
die "bad inception time $delta"
|
||||
unless abs($delta - $target) < 3;
|
||||
die "bad inception time $delta" unless abs($delta - $target) < 3;
|
||||
|
||||
@@ -38,7 +38,7 @@ id2=$id2
|
||||
EOF
|
||||
|
||||
tac() {
|
||||
perl -e 'print reverse <>' "$@"
|
||||
$PERL -e 'print reverse <>' "$@"
|
||||
}
|
||||
|
||||
convert() {
|
||||
|
||||
@@ -51,7 +51,7 @@ check_stderr() {
|
||||
}
|
||||
|
||||
check_stdout() {
|
||||
cmp out.$n "${out:-empty}" >/dev/null && return
|
||||
$DIFF out.$n "${out:-empty}" >/dev/null && return
|
||||
echo_d "stdout did not match '$out'"
|
||||
( echo "wanted"
|
||||
cat "$out"
|
||||
@@ -127,10 +127,10 @@ name='in-place backup correct modification time'
|
||||
testcase 0 $PERL checkmtime.pl 7200 DS.inplace.bak
|
||||
|
||||
name='in-place correct output'
|
||||
testcase 0 cmp DS.1 DS.inplace
|
||||
testcase 0 $DIFF DS.1 DS.inplace
|
||||
|
||||
name='in-place backup unmodified'
|
||||
testcase 0 cmp DS.1 DS.inplace.bak
|
||||
testcase 0 $DIFF DS.1 DS.inplace.bak
|
||||
|
||||
name='one mangled DS'
|
||||
err='found RRSIG by key'
|
||||
|
||||
Reference in New Issue
Block a user