]> Cypherpunks.ru repositories - gostls13.git/commitdiff
build: simplify clean.bash
authorDave Cheney <dave@cheney.net>
Wed, 2 Mar 2011 19:57:47 +0000 (14:57 -0500)
committerRuss Cox <rsc@golang.org>
Wed, 2 Mar 2011 19:57:47 +0000 (14:57 -0500)
R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/4257045

src/clean.bash
test/bench/Makefile [new file with mode: 0644]
test/bench/clean.bash [deleted file]

index 5c1dded5659332c3628d75a2500fa2fac588cb76..7969e2cd06b87c1c1182f14c3823d2f26c027df6 100755 (executable)
@@ -22,11 +22,6 @@ rm -f "$GOROOT"/lib/*.a
 for i in lib9 libbio libmach cmd pkg \
        ../misc/cgo/gmp ../misc/cgo/stdio \
        ../test/bench ../test/garbage
-do(
-       cd "$GOROOT"/src/$i || exit 1
-       if test -f clean.bash; then
-               bash clean.bash --gomake $MAKE
-       else
-               $MAKE clean
-       fi
-)done
+do
+       gomake -C "$GOROOT/src/$i" clean
+done
diff --git a/test/bench/Makefile b/test/bench/Makefile
new file mode 100644 (file)
index 0000000..145fe0c
--- /dev/null
@@ -0,0 +1,14 @@
+# 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/clean.bash b/test/bench/clean.bash
deleted file mode 100755 (executable)
index d56c0e3..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-OS=568
-rm -f [$OS].out *.[$OS]