|
9 | 9 | "errors"
|
10 | 10 | "flag"
|
11 | 11 | "fmt"
|
12 |
| - "io/ioutil" |
13 | 12 | "log"
|
14 | 13 | "os"
|
15 | 14 | "os/exec"
|
@@ -502,25 +501,12 @@ func (t *tester) registerTests() {
|
502 | 501 | }
|
503 | 502 | }
|
504 | 503 |
|
505 |
| - // Doc and shootout tests only run on builders. |
| 504 | + // Doc tests only run on builders. |
506 | 505 | // They find problems approximately never.
|
507 | 506 | if t.hasBash() && t.goos != "nacl" && t.goos != "android" && !t.iOS() && os.Getenv("GO_BUILDER_NAME") != "" {
|
508 | 507 | t.registerTest("doc_progs", "../doc/progs", "time", "go", "run", "run.go")
|
509 | 508 | t.registerTest("wiki", "../doc/articles/wiki", "./test.bash")
|
510 | 509 | 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 |
| - } |
524 | 510 | }
|
525 | 511 |
|
526 | 512 | if t.goos != "android" && !t.iOS() {
|
@@ -994,18 +980,6 @@ func (t *tester) testDirTest(dt *distTest, shard, shards int) error {
|
994 | 980 | return nil
|
995 | 981 | }
|
996 | 982 |
|
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 |
| - |
1009 | 983 | // mergeEnvLists merges the two environment lists such that
|
1010 | 984 | // variables with the same name in "in" replace those in "out".
|
1011 | 985 | // out may be mutated.
|
|
0 commit comments