summaryrefslogtreecommitdiff
path: root/test/bench
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2012-02-24 16:59:09 +1100
committerRob Pike <r@golang.org>2012-02-24 16:59:09 +1100
commit2487d147198c4064ac348392c09d68ea42347070 (patch)
treed6a4dac8a3f9408f91be2b71767a6f4ca21a544e /test/bench
parent37cf16917772e4deef7940a37c646d19c494fb2f (diff)
downloadgo-2487d147198c4064ac348392c09d68ea42347070.tar.gz
test/bench/shootout: update post-Makefile
R=golang-dev, rsc CC=golang-dev http://codereview.appspot.com/5696054
Diffstat (limited to 'test/bench')
-rw-r--r--test/bench/shootout/Makefile14
-rwxr-xr-xtest/bench/shootout/timing.sh6
2 files changed, 5 insertions, 15 deletions
diff --git a/test/bench/shootout/Makefile b/test/bench/shootout/Makefile
deleted file mode 100644
index e1c9b7b80..000000000
--- a/test/bench/shootout/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2011 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.
-
-include ../../../src/Make.inc
-
-all:
- @echo "make clean or timing"
-
-timing:
- ./timing.sh
-
-clean:
- rm -f [568].out *.[568]
diff --git a/test/bench/shootout/timing.sh b/test/bench/shootout/timing.sh
index 3e190e15c..dd3e664f4 100755
--- a/test/bench/shootout/timing.sh
+++ b/test/bench/shootout/timing.sh
@@ -5,7 +5,11 @@
set -e
-eval $(gomake --no-print-directory -f ../../../src/Make.inc go-env)
+eval $(go tool dist env)
+O=$GOCHAR
+GC="go tool ${O}g"
+LD="go tool ${O}l"
+
PATH=.:$PATH
havegccgo=false