3 Don't use --quiet in dotest
5 --quiet is Debian specific.
6 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=56853
7 Just use grep to make time quiet.
9 ----------- Diffstat output ------------
10 ./dotest | 32 ++++++++++++++++----------------
11 1 files changed, 16 insertions(+), 16 deletions(-)
13 diff ./dotest~current~ ./dotest
14 --- ./dotest~current~ 2004-02-03 13:00:48.000000000 +1100
15 +++ ./dotest 2004-02-03 13:01:10.000000000 +1100
16 @@ -34,47 +34,47 @@ do
20 - then /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -dw orig new | diff -u diff - ; xit=$?
21 - else /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -dwp1 orig patch | diff -u diff - ; xit=$?
22 + then /usr/bin/time -o .time -f '%U' $WIGGLE -dw orig new | diff -u diff - ; xit=$?
23 + else /usr/bin/time -o .time -f '%U' $WIGGLE -dwp1 orig patch | diff -u diff - ; xit=$?
27 - then /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -dl orig new | diff -u ldiff - ; xit=$?
28 - else /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -dlp1 orig patch | diff -u ldiff - ; xit=$?
29 + then /usr/bin/time -o .time -f '%U' $WIGGLE -dl orig new | diff -u ldiff - ; xit=$?
30 + else /usr/bin/time -o .time -f '%U' $WIGGLE -dlp1 orig patch | diff -u ldiff - ; xit=$?
33 - reldiff ) /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -dl patch | diff -u reldiff - ; xit=$?
34 + reldiff ) /usr/bin/time -o .time -f '%U' $WIGGLE -dl patch | diff -u reldiff - ; xit=$?
36 - rediff ) /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -dw patch | diff -u rediff - ; xit=$?
37 + rediff ) /usr/bin/time -o .time -f '%U' $WIGGLE -dw patch | diff -u rediff - ; xit=$?
39 merge ) if [ -f patch ]
40 - then /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -m orig patch | diff -u merge - ; xit=$?
41 + then /usr/bin/time -o .time -f '%U' $WIGGLE -m orig patch | diff -u merge - ; xit=$?
43 - then /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -m orig new new2 | diff -u merge - ; xit=$?
44 - else /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -m orig | diff -u merge - ; xit=$?
45 + then /usr/bin/time -o .time -f '%U' $WIGGLE -m orig new new2 | diff -u merge - ; xit=$?
46 + else /usr/bin/time -o .time -f '%U' $WIGGLE -m orig | diff -u merge - ; xit=$?
49 replace ) cp orig orig.tmp
51 - then /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -mr orig.tmp patch
52 - else /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -mr orig.tmp new new2
53 + then /usr/bin/time -o .time -f '%U' $WIGGLE -mr orig.tmp patch
54 + else /usr/bin/time -o .time -f '%U' $WIGGLE -mr orig.tmp new new2
56 diff -u merge orig.tmp ; xit=$?
57 rm orig.tmp orig.tmp.porig
59 lmerge ) if [ -f patch ]
60 - then /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -ml orig patch | diff -u lmerge - ; xit=$?
61 - else /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -ml orig new new2 | diff -u lmerge - ; xit=$?
62 + then /usr/bin/time -o .time -f '%U' $WIGGLE -ml orig patch | diff -u lmerge - ; xit=$?
63 + else /usr/bin/time -o .time -f '%U' $WIGGLE -ml orig new new2 | diff -u lmerge - ; xit=$?
66 wmerge ) if [ -f patch ]
67 - then /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -mw orig patch | diff -u wmerge - ; xit=$?
68 - else /usr/bin/time --quiet -o .time -f '%U' $WIGGLE -mw orig new new2 | diff -u wmerge - ; xit=$?
69 + then /usr/bin/time -o .time -f '%U' $WIGGLE -mw orig patch | diff -u wmerge - ; xit=$?
70 + else /usr/bin/time -o .time -f '%U' $WIGGLE -mw orig new new2 | diff -u wmerge - ; xit=$?
74 if [ $xit = 0 ]; then msg=SUCCEEDED; else msg=FAILED; fi
75 - echo $path $msg `cat .time 2> /dev/null`
76 + echo $path $msg `grep -v 'Command exited' .time 2> /dev/null`