diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/dist/test.go | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index eeec7e3a9d..679c23bb22 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -9,7 +9,6 @@ import ( "errors" "flag" "fmt" - "io/ioutil" "log" "os" "os/exec" @@ -502,25 +501,12 @@ func (t *tester) registerTests() { } } - // Doc and shootout tests only run on builders. + // Doc tests only run on builders. // They find problems approximately never. if t.hasBash() && t.goos != "nacl" && t.goos != "android" && !t.iOS() && os.Getenv("GO_BUILDER_NAME") != "" { t.registerTest("doc_progs", "../doc/progs", "time", "go", "run", "run.go") t.registerTest("wiki", "../doc/articles/wiki", "./test.bash") t.registerTest("codewalk", "../doc/codewalk", "time", "./run") - for _, name := range t.shootoutTests() { - if name == "spectralnorm" { - switch os.Getenv("GO_BUILDER_NAME") { - case "linux-arm-arm5", "linux-mips64-minux": - // Heavy on floating point and takes over 20 minutes with - // softfloat on arm5 builder and over 33 minutes on MIPS64 - // builder with kernel FPU emulator. - // Disabled per Issue 12688. - continue - } - } - t.registerSeqTest("shootout:"+name, "../test/bench/shootout", "time", "./timing.sh", "-test", name) - } } if t.goos != "android" && !t.iOS() { @@ -994,18 +980,6 @@ func (t *tester) testDirTest(dt *distTest, shard, shards int) error { return nil } -func (t *tester) shootoutTests() []string { - sh, err := ioutil.ReadFile(filepath.Join(t.goroot, "test", "bench", "shootout", "timing.sh")) - if err != nil { - log.Fatal(err) - } - m := regexp.MustCompile(`(?m)^\s+run="([\w+ ]+)"\s*$`).FindSubmatch(sh) - if m == nil { - log.Fatal("failed to find run=\"...\" line in test/bench/shootout/timing.sh") - } - return strings.Fields(string(m[1])) -} - // mergeEnvLists merges the two environment lists such that // variables with the same name in "in" replace those in "out". // out may be mutated. |