  	if p.Root != "" {
  		if p.Goroot {
  			p.SrcRoot = ctxt.joinPath(p.Root, "src", "pkg")
-diff -r 87dea3f5ebe7 src/pkg/go/printer/nodes.go
---- a/src/pkg/go/printer/nodes.go
-+++ b/src/pkg/go/printer/nodes.go
-@@ -330,7 +330,10 @@
- 	} else {
- 		p.print(token.LPAREN, token.RPAREN)
- 	}
--	n := result.NumFields()
-+	n := 0
-+	if result != nil {
-+		n = result.NumFields()
-+	}
- 	if n > 0 {
- 		// result != nil
- 		p.print(blank)
 diff -r 87dea3f5ebe7 src/pkg/go/scanner/scanner.go
 --- a/src/pkg/go/scanner/scanner.go
 +++ b/src/pkg/go/scanner/scanner.go

 }
 
 func readTestFile(t *testing.T, zt ZipTest, ft ZipTestFile, f *File) {
diff -r 87dea3f5ebe7 src/pkg/bytes/buffer_test.go
--- a/src/pkg/bytes/buffer_test.go
+++ b/src/pkg/bytes/buffer_test.go
@@ -231,12 +231,12 @@
 	empty(t, "TestMixedReadsAndWrites (2)", &buf, s, make([]byte, buf.Len()))
 }
 
-func TestNil(t *testing.T) {
-	var b *Buffer
-	if b.String() != "<nil>" {
-		t.Errorf("expected <nil>; got %q", b.String())
-	}
-}
+// func TestNil(t *testing.T) {
+// 	var b *Buffer
+// 	if b.String() != "<nil>" {
+// 		t.Errorf("expected <nil>; got %q", b.String())
+// 	}
+// }
 
 func TestReadFrom(t *testing.T) {
 	var buf Buffer
diff -r 87dea3f5ebe7 src/pkg/compress/gzip/gunzip_test.go
--- a/src/pkg/compress/gzip/gunzip_test.go
+++ b/src/pkg/compress/gzip/gunzip_test.go
@@ -307,6 +307,7 @@
 }
 
 func TestIssue6550(t *testing.T) {
+	t.Skip()
 	f, err := os.Open("testdata/issue6550.gz")
 	if err != nil {
 		t.Fatal(err)
diff -r 87dea3f5ebe7 src/pkg/crypto/rc4/rc4_ref.go
--- a/src/pkg/crypto/rc4/rc4_ref.go
+++ b/src/pkg/crypto/rc4/rc4_ref.go

 	}
 	c.i, c.j = i, j
 }
diff -r 87dea3f5ebe7 src/pkg/encoding/json/stream_test.go
--- a/src/pkg/encoding/json/stream_test.go
+++ b/src/pkg/encoding/json/stream_test.go
@@ -7,7 +7,7 @@
 import (
 	"bytes"
 	"io/ioutil"
-	"net"
+	// "net"
 	"reflect"
 	"strings"
 	"testing"
@@ -171,26 +171,26 @@
 	}
 }
 
-var blockingTests = []string{
-	`{"x": 1}`,
-	`[1, 2, 3]`,
-}
+// var blockingTests = []string{
+// 	`{"x": 1}`,
+// 	`[1, 2, 3]`,
+// }
 
-func TestBlocking(t *testing.T) {
-	for _, enc := range blockingTests {
-		r, w := net.Pipe()
-		go w.Write([]byte(enc))
-		var val interface{}
+// func TestBlocking(t *testing.T) {
+// 	for _, enc := range blockingTests {
+// 		r, w := net.Pipe()
+// 		go w.Write([]byte(enc))
+// 		var val interface{}
 
-		// If Decode reads beyond what w.Write writes above,
-		// it will block, and the test will deadlock.
-		if err := NewDecoder(r).Decode(&val); err != nil {
-			t.Errorf("decoding %s: %v", enc, err)
-		}
-		r.Close()
-		w.Close()
-	}
-}
+// 		// If Decode reads beyond what w.Write writes above,
+// 		// it will block, and the test will deadlock.
+// 		if err := NewDecoder(r).Decode(&val); err != nil {
+// 			t.Errorf("decoding %s: %v", enc, err)
+// 		}
+// 		r.Close()
+// 		w.Close()
+// 	}
+// }
 
 func BenchmarkEncoderEncode(b *testing.B) {
 	b.ReportAllocs()
diff -r 87dea3f5ebe7 src/pkg/go/build/build.go
--- a/src/pkg/go/build/build.go
+++ b/src/pkg/go/build/build.go
