From: Than McIntosh Date: Wed, 13 Nov 2019 15:03:19 +0000 (-0500) Subject: cmd/link: don't run TestDWARF in c-archive mode on Windows X-Git-Tag: go1.14beta1~213 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=62581ee982bef250a1b53af2e3591f1193fe27ee;p=gostls13.git cmd/link: don't run TestDWARF in c-archive mode on Windows Test fix: in dwarf_test.go don't try to run the TestDWARF testpoint on windows with c-archive build mode (linker + debug/pe support for that build mode on Windows is not fully baked it seems). Fixes #35512. Change-Id: I1c87ff3d62e5b98e75062b184d762fb5ed937745 Reviewed-on: https://go-review.googlesource.com/c/go/+/206899 Run-TryBot: Than McIntosh TryBot-Result: Gobot Gobot Reviewed-by: Bryan C. Mills --- diff --git a/src/cmd/link/dwarf_test.go b/src/cmd/link/dwarf_test.go index db9f384e7f..37d570f08b 100644 --- a/src/cmd/link/dwarf_test.go +++ b/src/cmd/link/dwarf_test.go @@ -139,13 +139,6 @@ func testDWARF(t *testing.T, buildmode string, expectDWARF bool, env ...string) } } - // Until there is a fix for issue 35512, don't try to use - // SeekPC or look at the line table on Windows under - // c-archive build mode. - if buildmode == "c-archive" && runtime.GOOS == "windows" { - t.Skip("avoiding SeekPC until 35512 fixed") - } - // TODO: We'd like to use filepath.Join here. // Also related: golang.org/issue/19784. wantFile := path.Join(prog, "main.go") @@ -175,6 +168,9 @@ func testDWARF(t *testing.T, buildmode string, expectDWARF bool, env ...string) func TestDWARF(t *testing.T) { testDWARF(t, "", true) if !testing.Short() { + if runtime.GOOS == "windows" { + t.Skip("skipping Windows/c-archive; see Issue 35512 for more.") + } t.Run("c-archive", func(t *testing.T) { testDWARF(t, "c-archive", true) })