cmd/godoc, cmd/fiximports: fix or skip failing tests at tip

Fix godoc test failure.

Skip fiximports test failure for now, to not hide other
failures. (tracking bug to fix properly in golang/go#17417)

x/tools being broken is preventing use of trybots for unrelated CLs.

Change-Id: I3a1deee4036096e0377cf8b63fabe444c58dd86e
Reviewed-on: https://go-review.googlesource.com/30953
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Alan Donovan <adonovan@google.com>

cmd/fiximports/main_test.go

diff --git a/cmd/fiximports/main_test.go b/cmd/fiximports/main_test.go
index e6be110..75319a0 100644
--- a/cmd/fiximports/main_test.go
+++ b/cmd/fiximports/main_test.go
@@ -200,7 +200,10 @@
 		}
 
 		// Compare stderr output.
-		if stderr.(*bytes.Buffer).String() != test.wantStderr {
+		if got := stderr.(*bytes.Buffer).String(); got != test.wantStderr {
+			if strings.Contains(got, "vendor/golang_org/x/text/unicode/norm") {
+				t.Skip("skipping known-broken test; see golang.org/issue/17417")
+			}
 			t.Errorf("#%d. stderr: got <<%s>>, want <<%s>>",
 				i, stderr, test.wantStderr)
 		}

cmd/godoc/godoc_test.go

diff --git a/cmd/godoc/godoc_test.go b/cmd/godoc/godoc_test.go
index e4ab12f..5736296 100644
--- a/cmd/godoc/godoc_test.go
+++ b/cmd/godoc/godoc_test.go
@@ -277,7 +277,7 @@
 		{
 			path: "/cmd/compile/internal/amd64/",
 			match: []string{
-				`href="/src/cmd/compile/internal/amd64/reg.go"`,
+				`href="/src/cmd/compile/internal/amd64/prog.go"`,
 			},
 		},
 	}