diff options
| author | Russ Cox <rsc@golang.org> | 2010-09-19 23:28:32 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-09-19 23:28:32 -0400 |
| commit | e950dee32763d053493ef97f32a910ca3bc22e5b (patch) | |
| tree | 838105c3ada1289d8fea7028b8b3f561fdb21310 | |
| parent | 1f7125da2e7833808ad2e4f982eb4ded5cecaaf5 (diff) | |
| download | go-e950dee32763d053493ef97f32a910ca3bc22e5b.tar.gz | |
test: fix NaCl build
Wasn't running the temp binary under $E (emulator).
R=r
CC=golang-dev
http://codereview.appspot.com/2237043
| -rw-r--r-- | test/index.go | 4 | ||||
| -rwxr-xr-x | test/run | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/index.go b/test/index.go index a91294cff..38aa33dd3 100644 --- a/test/index.go +++ b/test/index.go @@ -1,8 +1,8 @@ // $G $D/$F.go && $L $F.$A && -// ./$A.out -pass 0 >tmp.go && $G tmp.go && $L -o tmp1.$A tmp.$A && ./tmp1.$A && +// ./$A.out -pass 0 >tmp.go && $G tmp.go && $L -o $A.out1 tmp.$A && ./$A.out1 && // ./$A.out -pass 1 >tmp.go && errchk $G -e tmp.go && // ./$A.out -pass 2 >tmp.go && errchk $G -e tmp.go -// rm -f tmp.go +// rm -f tmp.go $A.out1 // Copyright 2010 The Go Authors. All rights reserved. // Use of this source code is governed by a BSD-style @@ -57,7 +57,7 @@ do do export F=$(basename $i .go) export D=$dir - sed '/^\/\//!q' $i | sed 's@//@@; $d' |sed 's|./\$A.out|$E &|' >$RUNFILE + sed '/^\/\//!q' $i | sed 's@//@@; $d' |sed 's|./\$A.out|$E &|g' >$RUNFILE if ! { time -p bash -c "bash $RUNFILE >$TMP1FILE 2>&1" ; } 2>$TMP2FILE then echo @@ -99,6 +99,7 @@ done | # clean up some stack noise /^Trace\/BPT trap/d /RUNFILE/ s/line 1: *[0-9]*/line 1: PID/ /^\$RUNFILE: line 1: PID Trace\/breakpoint trap/d + /Fault in NaCl untrusted code/d /Segmentation fault/d /^qemu: uncaught target signal 11 (Segmentation fault) - exiting/d' > run.out |