comparison tests/test-summaries.sh @ 110:ca565b18ba3e multiplex

Merge from default branch
author Chris Cannam
date Thu, 02 Oct 2014 14:54:48 +0100
parents 8b4924a9a072
children 0fe5abb56a6e
comparison
equal deleted inserted replaced
107:7b60603966cf 110:ca565b18ba3e
12 tmpcmp2=$mypath/tmp_4_$$ 12 tmpcmp2=$mypath/tmp_4_$$
13 13
14 trap "rm -f $tmpfile $tmpcanonical $expcanonical $tmpcmp1 $tmpcmp2" 0 14 trap "rm -f $tmpfile $tmpcanonical $expcanonical $tmpcmp1 $tmpcmp2" 0
15 15
16 . test-include.sh 16 . test-include.sh
17
18 faildiff() {
19 echo "Test failed: $1"
20 if [ -n "$2" -a -n "$3" ]; then
21 echo "Output follows:"
22 echo "--"
23 cat $2
24 echo "--"
25 echo "Expected output follows:"
26 echo "--"
27 cat $3
28 echo "--"
29 echo "Diff:"
30 echo "--"
31 sdiff -w78 $2 $3
32 echo "--"
33 fi
34 exit 1
35 }
36 17
37 compare() { 18 compare() {
38 a=$1 19 a=$1
39 b=$2 20 b=$2
40 sort $a > $tmpcmp1 21 sort $a > $tmpcmp1