diff options
| author | Russ Cox <rsc@golang.org> | 2011-07-28 13:04:52 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2011-07-28 13:04:52 -0400 |
| commit | f9ff2bdcd9b752cb1545199c68d3c01b673ab670 (patch) | |
| tree | 2b2577da64d944f48eae4a335c60b94ef84f2e7c /test/run | |
| parent | 6a371443812b4207fa9471d241eb08ddd87c58fb (diff) | |
| download | go-f9ff2bdcd9b752cb1545199c68d3c01b673ab670.tar.gz | |
build: handle spaces in $USER
Fixes issue 2107.
R=golang-dev, r
CC=golang-dev
http://codereview.appspot.com/4830042
Diffstat (limited to 'test/run')
| -rwxr-xr-x | test/run | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -33,9 +33,9 @@ failed=0 PATH=/bin:/usr/bin:/usr/local/bin:${GOBIN:-$GOROOT/bin}:`pwd` -RUNFILE=/tmp/gorun-$$-$USER -TMP1FILE=/tmp/gotest1-$$-$USER -TMP2FILE=/tmp/gotest2-$$-$USER +RUNFILE="/tmp/gorun-$$-$USER" +TMP1FILE="/tmp/gotest1-$$-$USER" +TMP2FILE="/tmp/gotest2-$$-$USER" # don't run the machine out of memory: limit individual processes to 4GB. # on thresher, 3GB suffices to run the tests; with 2GB, peano fails. @@ -64,20 +64,20 @@ do fi export F=$(basename $i .go) export D=$dir - 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 + 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 echo "===========" $i - cat $TMP1FILE + cat "$TMP1FILE" echo >&2 fail: $i echo "# $i # fail" >>pass.out - elif test -s $TMP1FILE + elif test -s "$TMP1FILE" then echo echo "===========" $i - cat $TMP1FILE - if grep -q '^BUG' $TMP1FILE + cat "$TMP1FILE" + if grep -q '^BUG' "$TMP1FILE" then if [ $dir != bugs ] then @@ -93,13 +93,13 @@ do else echo $i >>pass.out fi - echo $(awk 'NR==1{print $2}' $TMP2FILE) $D/$F >>times.out + echo $(awk 'NR==1{print $2}' "$TMP2FILE") $D/$F >>times.out rm -f $F.$A $A.out ) done done | # clean up some stack noise egrep -v '^(r[0-9a-z]+|[cfg]s) +0x' | sed '/tmp.*Bus error/s/.*Bus/Bus/; /tmp.*Trace.BPT/s/.*Trace/Trace/ - s!'$RUNFILE'!$RUNFILE!g + s!'"$RUNFILE"'!$RUNFILE!g s/^PC=0x[0-9a-f]*/pc: xxx/ s/^pc: 0x[0-9a-f]*/pc: xxx/ s/PC=0x[0-9a-f]*/PC=xxx/ @@ -110,7 +110,7 @@ done | # clean up some stack noise /Segmentation fault/d /^qemu: uncaught target signal 11 (Segmentation fault) - exiting/d' > run.out -rm -f $RUNFILE $TMP1FILE $TMP2FILE *.$A *.a $A.out +rm -f "$RUNFILE" "$TMP1FILE" "$TMP2FILE" *.$A *.a $A.out diffmsg="" if ! diff $golden run.out then |