Skip to content

Commit bb91a7e

Browse files
committed
test/bench/shootout: delete
We don't use these for benchmarking anymore. Now we have the go1 dir and the benchmarks subrepo. Some have problematic copyright notices, so move out of main repo. Preserved in golang.org/x/exp/shootout. Fixes #12688. Fixes #13584. Change-Id: Ic0b71191ca1a286d33d7813aca94bab1617a1c82 Reviewed-on: https://go-review.googlesource.com/18320 Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 91ba9f4 commit bb91a7e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1
-7720
lines changed

src/cmd/dist/test.go

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"errors"
1010
"flag"
1111
"fmt"
12-
"io/ioutil"
1312
"log"
1413
"os"
1514
"os/exec"
@@ -502,25 +501,12 @@ func (t *tester) registerTests() {
502501
}
503502
}
504503

505-
// Doc and shootout tests only run on builders.
504+
// Doc tests only run on builders.
506505
// They find problems approximately never.
507506
if t.hasBash() && t.goos != "nacl" && t.goos != "android" && !t.iOS() && os.Getenv("GO_BUILDER_NAME") != "" {
508507
t.registerTest("doc_progs", "../doc/progs", "time", "go", "run", "run.go")
509508
t.registerTest("wiki", "../doc/articles/wiki", "./test.bash")
510509
t.registerTest("codewalk", "../doc/codewalk", "time", "./run")
511-
for _, name := range t.shootoutTests() {
512-
if name == "spectralnorm" {
513-
switch os.Getenv("GO_BUILDER_NAME") {
514-
case "linux-arm-arm5", "linux-mips64-minux":
515-
// Heavy on floating point and takes over 20 minutes with
516-
// softfloat on arm5 builder and over 33 minutes on MIPS64
517-
// builder with kernel FPU emulator.
518-
// Disabled per Issue 12688.
519-
continue
520-
}
521-
}
522-
t.registerSeqTest("shootout:"+name, "../test/bench/shootout", "time", "./timing.sh", "-test", name)
523-
}
524510
}
525511

526512
if t.goos != "android" && !t.iOS() {
@@ -994,18 +980,6 @@ func (t *tester) testDirTest(dt *distTest, shard, shards int) error {
994980
return nil
995981
}
996982

997-
func (t *tester) shootoutTests() []string {
998-
sh, err := ioutil.ReadFile(filepath.Join(t.goroot, "test", "bench", "shootout", "timing.sh"))
999-
if err != nil {
1000-
log.Fatal(err)
1001-
}
1002-
m := regexp.MustCompile(`(?m)^\s+run="([\w+ ]+)"\s*$`).FindSubmatch(sh)
1003-
if m == nil {
1004-
log.Fatal("failed to find run=\"...\" line in test/bench/shootout/timing.sh")
1005-
}
1006-
return strings.Fields(string(m[1]))
1007-
}
1008-
1009983
// mergeEnvLists merges the two environment lists such that
1010984
// variables with the same name in "in" replace those in "out".
1011985
// out may be mutated.

test/bench/shootout/binary-tree-freelist.go

Lines changed: 0 additions & 129 deletions
This file was deleted.

test/bench/shootout/binary-tree-freelist.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

test/bench/shootout/binary-tree.c

Lines changed: 0 additions & 164 deletions
This file was deleted.

0 commit comments

Comments
 (0)