Skip to content

Commit b81dd1c

Browse files
committed
cmd/link: disable new testpoint on mips pending investigation
Skip TestMinusRSymsWithSameName testpoint on MIPS for the time being since it triggers failures on that arch. Will re-enable once the problems are fixed. Updates #35779. Change-Id: I3e6650158ab04a2be77e3db5a5194df3bbb0859e Reviewed-on: https://go-review.googlesource.com/c/go/+/208557 Reviewed-by: Cherry Zhang <[email protected]>
1 parent 6f7b96f commit b81dd1c

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/cmd/link/elf_test.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"os"
1414
"os/exec"
1515
"path/filepath"
16+
"runtime"
1617
"strings"
1718
"testing"
1819
)
@@ -132,12 +133,18 @@ int Cfunc2() { return blah(); }
132133
// TestMinusRSymsWithSameName tests a corner case in the new
133134
// loader. Prior to the fix this failed with the error 'loadelf:
134135
// $WORK/b001/_pkg_.a(ldr.syso): duplicate symbol reference: blah in
135-
// both main(.text) and main(.text)'
136+
// both main(.text) and main(.text)'. See issue #35779.
136137
func TestMinusRSymsWithSameName(t *testing.T) {
137138
testenv.MustHaveGoBuild(t)
138139
testenv.MustHaveCGO(t)
139140
t.Parallel()
140141

142+
// Skip this test on MIPS for the time being since it seems to trigger
143+
// problems with unknown relocations.
144+
if strings.Contains(runtime.GOARCH, "mips") {
145+
testenv.SkipFlaky(t, 35779)
146+
}
147+
141148
dir, err := ioutil.TempDir("", "go-link-TestMinusRSymsWithSameName")
142149
if err != nil {
143150
t.Fatal(err)
@@ -197,7 +204,6 @@ func TestMinusRSymsWithSameName(t *testing.T) {
197204
cmd := exec.Command(goTool, "build")
198205
cmd.Dir = dir
199206
cmd.Env = env
200-
t.Logf("%s build", goTool)
201207
if out, err := cmd.CombinedOutput(); err != nil {
202208
t.Logf("%s", out)
203209
t.Fatal(err)

0 commit comments

Comments
 (0)