summaryrefslogtreecommitdiff
path: root/test/run
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2010-09-19 23:28:32 -0400
committerRuss Cox <rsc@golang.org>2010-09-19 23:28:32 -0400
commite950dee32763d053493ef97f32a910ca3bc22e5b (patch)
tree838105c3ada1289d8fea7028b8b3f561fdb21310 /test/run
parent1f7125da2e7833808ad2e4f982eb4ded5cecaaf5 (diff)
downloadgo-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
Diffstat (limited to 'test/run')
-rwxr-xr-xtest/run3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/run b/test/run
index 4ca775414..f4765d7fa 100755
--- a/test/run
+++ b/test/run
@@ -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