summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2012-02-16 23:48:24 -0500
committerRuss Cox <rsc@golang.org>2012-02-16 23:48:24 -0500
commit66ab3d5ec1d063f730c56ac2e2dfb4363974ac2c (patch)
tree6440fc2f0f55e42c56deeeded392df3ad4b84bec
parent5813a0170d1661826a950fa310748f00bdab4b5f (diff)
downloadgo-66ab3d5ec1d063f730c56ac2e2dfb4363974ac2c.tar.gz
test: add testlib
R=golang-dev, bradfitz CC=golang-dev http://codereview.appspot.com/5676077
-rwxr-xr-xtest/run3
-rw-r--r--test/testlib22
2 files changed, 24 insertions, 1 deletions
diff --git a/test/run b/test/run
index 7f4c350fa..67526958d 100755
--- a/test/run
+++ b/test/run
@@ -67,7 +67,8 @@ do
fi
export F=$(basename $i .go)
export D=$dir
- sed '/^\/\//!q' $i | sed 's@//@@; $d' |sed 's|./\$A.out|$E &|g' >"$RUNFILE"
+ echo '. ./testlib' >"$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
diff --git a/test/testlib b/test/testlib
new file mode 100644
index 000000000..ea8c5d74e
--- /dev/null
+++ b/test/testlib
@@ -0,0 +1,22 @@
+# Copyright 2012 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# These function names are also known to
+# (and are the plan for transitioning to) run.go.
+
+compile() {
+ $G $D/$F.go
+}
+
+build() {
+ $G $D/$F.go && $L $F.$A
+}
+
+run() {
+ $G $D/$F.go && $L $F.$A && ./$A.out "$@"
+}
+
+errorcheck() {
+ errchk $G -e $D/$F.go
+}