fix a couple of tests that had shell errors

clean up the golden file a bit to have less meaningless content and be more robust to spurious diffs.
now there is output only for tests that produce output or failure.

R=gri
OCL=14005
CL=14005

diff --git a/test/golden.out b/test/golden.out
index 83dc431f9824ab34c1b9da106c13abdfab481238..8ae432b1d5109cafe05eacd9a032782bce3c8595 100644 (file)
--- a/test/golden.out
+++ b/test/golden.out
@@ -1,35 +1,11 @@
 
-=========== ./args.go
-
-=========== ./char_lit.go
-
-=========== ./float_lit.go
-
-=========== ./for.go
-
-=========== ./func.go
-
 =========== ./func1.go
 func1.go:12: var a redeclared in this block
      previous declaration at func1.go:12
 
-=========== ./hashmap.go
-
 =========== ./helloworld.go
 hello, world
 
-=========== ./if.go
-
-=========== ./if1.go
-
-=========== ./int_lit.go
-
-=========== ./iota.go
-
-=========== ./literal.go
-
-=========== ./nil.go
-
 =========== ./peano.go
 0! = 1
 1! = 1
@@ -43,87 +19,33 @@ hello, world
 9! = 362880
 10! = 3628800
 
-=========== ./readfile.go
-
-=========== ./sieve.go
-
-=========== ./simassign.go
-
-=========== ./string_lit.go
-
-=========== ./switch.go
-
-=========== ./switch1.go
-
-=========== ./test0.go
-
 =========== ./turing.go
 Hello World!
 
-=========== ./utf.go
-
-=========== ken/for.go
-
-=========== ken/interfun.go
-
 =========== ken/intervar.go
  print 1 bio 2 file 3 -- abc
 
 =========== ken/label.go
 100
 
-=========== ken/litfun.go
-
-=========== ken/mfunc.go
-
-=========== ken/ptrfun.go
-
-=========== ken/ptrvar.go
-
 =========== ken/rob1.go
 9876543210
 
 =========== ken/rob2.go
 (defn foo (add 12 34))
 
-=========== ken/robfor.go
-
-=========== ken/robfunc.go
-
-=========== ken/robif.go
-
-=========== ken/robiota.go
-
-=========== ken/simparray.go
-
-=========== ken/simpbool.go
-
-=========== ken/simpconv.go
-
-=========== ken/simpfun.go
-
 =========== ken/simpprint.go
 hello world
 
 =========== ken/simpswitch.go
 0out01out12out2aout34out4fiveout56out6aout78out89out9
 
-=========== ken/simpvar.go
-
 =========== ken/string.go
 abcxyz-abcxyz-abcxyz-abcxyz-abcxyz-abcxyz-abcxyz
 
-=========== ken/strvar.go
-
-=========== chan/fifo.go
-
 =========== chan/nonblock.go
 PASS
 
-=========== chan/powser1.go
-
-=========== chan/sieve.go
-
 =========== bugs/bug015.go
 BUG: known to succeed incorrectly
 
@@ -214,16 +136,22 @@ outer loop top k 1
 k not zero
 panic on line 310 PC=0x1362
 0x1362?zi
-       main·main(1, 0, 1606416392, ...)
-       main·main(0x1, 0x7fff5fbff808, 0x0, ...)
+       main·main(1, 0, 1606414952, ...)
+       main·main(0x1, 0x7fff5fbff268, 0x0, ...)
 BUG: crashes
+Trace/BPT trap          ./$A.out
 
 =========== bugs/bug072.go
+bugs/bug072.go:6: bug: undefined
+BUG: compiler crashes after error message - Bus error
+Bus error               $G $D/$F.go
 
 =========== bugs/bug073.go
 BUG: should not compile
 
 =========== bugs/bug074.go
+BUG: compiler crashes - Bus error
+Bus error               $G $D/$F.go
 
 =========== bugs/bug075.go
 bugs/bug075.go:11: bad shape across assignment - cr=1 cl=2
@@ -237,8 +165,6 @@ BUG: known to fail incorrectly
 =========== bugs/bug077.go
 BUG: known to succeed incorrectly
 
-=========== bugs/bug078.go
-
 =========== bugs/bug079.go
 BUG: succeeds incorrectly
 
@@ -249,107 +175,40 @@ bugs/bug080.go:12: illegal types for operand: CALL
 BUG: fails incorrectly
 
 =========== bugs/bug081.go
+bugs/bug081.go:5: first constant must evaluate an expression
+BUG: compiler should not crash
+Bus error               $G $D/$F.go
 
 =========== bugs/bug082.go
 bugs/bug082.go:7: fatal error: optoas: no entry COM-<int32>INT32
 BUG: fails incorrectly
 
-=========== bugs/bug083.go
-
 =========== bugs/bug085.go
 bugs/bug085.go:8: P: undefined
 BUG: fails incorrectly
+Bus error               $G $D/$F.go
 
 =========== bugs/bug086.go
 4882
 BUG: succeeds incorrectly
 
-=========== bugs/bug087.go
-bugs/bug087.go:8: illegal combination of literals LEN 9
-bugs/bug087.go:8: illegal combination of literals LEN 9
-BUG: fails incorrectly
-
-=========== fixedbugs/bug000.go
-
-=========== fixedbugs/bug001.go
-
-=========== fixedbugs/bug002.go
-
-=========== fixedbugs/bug003.go
-
-=========== fixedbugs/bug004.go
-
-=========== fixedbugs/bug005.go
-
-=========== fixedbugs/bug006.go
-
-=========== fixedbugs/bug007.go
-
-=========== fixedbugs/bug008.go
-
-=========== fixedbugs/bug009.go
-
-=========== fixedbugs/bug010.go
-
-=========== fixedbugs/bug011.go
-
-=========== fixedbugs/bug012.go
-
-=========== fixedbugs/bug013.go
-
-=========== fixedbugs/bug014.go
-
-=========== fixedbugs/bug016.go
-
-=========== fixedbugs/bug017.go
-
-=========== fixedbugs/bug020.go
-
-=========== fixedbugs/bug021.go
-
-=========== fixedbugs/bug022.go
-
-=========== fixedbugs/bug023.go
-
-=========== fixedbugs/bug024.go
-
 =========== fixedbugs/bug025.go
 fixedbugs/bug025.go:7: variable exported but not defined: Foo
 
-=========== fixedbugs/bug028.go
-
-=========== fixedbugs/bug030.go
-
-=========== fixedbugs/bug031.go
-
 =========== fixedbugs/bug035.go
 fixedbugs/bug035.go:6: var i redeclared in this block
      previous declaration at fixedbugs/bug035.go:5
 fixedbugs/bug035.go:7: var f redeclared in this block
      previous declaration at fixedbugs/bug035.go:5
 
-=========== fixedbugs/bug036.go
-
 =========== fixedbugs/bug037.go
 fixedbugs/bug037.go:6: vlong: undefined
 fixedbugs/bug037.go:6: fatal error: addvar: n=NAME-s G0 a(1) l(306) t=<T> nil
 
-=========== fixedbugs/bug038.go
-
 =========== fixedbugs/bug039.go
 fixedbugs/bug039.go:6: var x redeclared in this block
      previous declaration at fixedbugs/bug039.go:5
 
-=========== fixedbugs/bug040.go
-
-=========== fixedbugs/bug043.go
-
-=========== fixedbugs/bug044.go
-
-=========== fixedbugs/bug045.go
-
-=========== fixedbugs/bug049.go
-
 =========== fixedbugs/bug050.go
 fixedbugs/bug050.go:3: package statement must be first
 sys.6:1 fixedbugs/bug050.go:3: syntax error
@@ -357,29 +216,5 @@ sys.6:1 fixedbugs/bug050.go:3: syntax error
 =========== fixedbugs/bug051.go
 fixedbugs/bug051.go:10: expression must be a constant
 
-=========== fixedbugs/bug052.go
-
-=========== fixedbugs/bug055.go
-
-=========== fixedbugs/bug056.go
-
-=========== fixedbugs/bug057.go
-
-=========== fixedbugs/bug058.go
-
-=========== fixedbugs/bug059.go
-
-=========== fixedbugs/bug063.go
-
-=========== fixedbugs/bug065.go
-
-=========== fixedbugs/bug066.go
-
 =========== fixedbugs/bug067.go
 ok
-
-=========== fixedbugs/bug069.go
-
-=========== fixedbugs/bug071.go
-
-=========== fixedbugs/bug084.go

diff --git a/test/run b/test/run
index 806c1ec15724f485afd6e24b81d5fcaa1fb72ba1..fbc16fc0d1b9e0d93362a473500da5a98f224bf3 100755 (executable)
--- a/test/run
+++ b/test/run
@@ -18,28 +18,42 @@ export L=${A}l
 
 failed=0
 
+# don't use $$ in file names to avoid spurious diffs
+RUNFILE=/tmp/gorun-$USER
+TMP1FILE=/tmp/gotest1-$USER
+TMP2FILE=/tmp/gotest2-$USER
+
 for dir in . ken chan bugs fixedbugs
 do
        for i in $dir/*.go
        do
-               echo
-               echo '===========' $i
                export F=$(basename $i .go)
                export D=$dir
-               sed -n '1,/[^/]/p' $i | sed 's@//@@; $d' > /tmp/$USER.$$.gotest
-               if ! sh /tmp/$USER.$$.gotest
+               sed -n '1,/[^/]/p' $i | sed 's@//@@; $d' > $RUNFILE
+               if ! sh $RUNFILE >$TMP1FILE 2>$TMP2FILE
                then
+                       echo
+                       echo "===========" $i
+                       cat $TMP1FILE
+                       cat $TMP2FILE
                        echo >&2 fail: $i
+               elif test -s $TMP1FILE
+               then
+                       echo
+                       echo "===========" $i
+                       cat $TMP1FILE
+                       cat $TMP2FILE
                fi
        done
 done | # clean up some stack noise
-       egrep -v '^(r[0-9a-z]+|[cfg]s)  +0x' > run.out
+       egrep -v '^(r[0-9a-z]+|[cfg]s)  +0x'  |
+       sed '/tmp.*Bus error/s/.*Bus/Bus/; /tmp.*Trace.BPT/s/.*Trace/Trace/' > run.out
 
 case $failed in
 1)
        echo FAIL
 esac
-rm  -f /tmp/$USER.$$.gotest *.6 6.out
+rm  -f $RUNFILE $TMP1FILE $TMP2FILE *.6 6.out
 if ! diff run.out golden.out
 then
        failed=1