build: add gobuilder and goplay to run.bash
gobuilder: fix build to work with new log package
R=rsc
CC=golang-dev
https://golang.org/cl/2592041
diff --git a/misc/dashboard/builder/main.go b/misc/dashboard/builder/main.go
index fa48e07..d7a0963 100644
--- a/misc/dashboard/builder/main.go
+++ b/misc/dashboard/builder/main.go
@@ -86,7 +86,7 @@
}
for _, b := range builders {
if err := b.buildCommit(c); err != nil {
- log.Stderr(err)
+ log.Println(err)
}
runQueuedBenchmark()
}
@@ -96,7 +96,7 @@
for {
err := run(nil, goroot, "hg", "pull", "-u")
if err != nil {
- log.Stderr("hg pull failed:", err)
+ log.Println("hg pull failed:", err)
time.Sleep(waitInterval)
continue
}
@@ -129,7 +129,7 @@
func runBenchmark(r BenchRequest) {
// run benchmarks and send to dashboard
- log.Stderrf("%s benchmarking %d", r.builder.name, r.commit.num)
+ log.Println(r.builder.name, "benchmarking", r.commit.num)
defer os.RemoveAll(r.path)
pkg := path.Join(r.path, "go", "src", "pkg")
bin := path.Join(r.path, "go", "bin")
@@ -140,11 +140,11 @@
}
benchLog, _, err := runLog(env, pkg, "gomake", "bench")
if err != nil {
- log.Stderr("%s gomake bench:", r.builder.name, err)
+ log.Println(r.builder.name, "gomake bench:", err)
return
}
if err = r.builder.recordBenchmarks(benchLog, r.commit); err != nil {
- log.Stderr("recordBenchmarks:", err)
+ log.Println("recordBenchmarks:", err)
}
}
@@ -184,21 +184,21 @@
defer func() {
err := recover()
if err != nil {
- log.Stderr("%s build: %s", b.name, err)
+ log.Println(b.name, "build:", err)
}
}()
c, err := b.nextCommit()
if err != nil {
- log.Stderr(err)
+ log.Println(err)
return false
}
if c == nil {
return false
}
- log.Stderrf("%s building %d", b.name, c.num)
+ log.Println(b.name, "building", c.num)
err = b.buildCommit(*c)
if err != nil {
- log.Stderr(err)
+ log.Println(err)
}
return true
}
diff --git a/src/run.bash b/src/run.bash
index 4341d9d..4455d27 100755
--- a/src/run.bash
+++ b/src/run.bash
@@ -95,6 +95,14 @@
fi
) || exit $?
+for i in ../misc/dashboard/builder ../misc/goplay
+do
+ (xcd $i
+ gomake clean
+ gomake
+ ) || exit $?
+done
+
[ "$GOARCH" == arm ] ||
(xcd ../test/bench
if [[ $(uname | tr A-Z a-z | sed 's/mingw/windows/') != *windows* ]]; then
