cmd/dist: reenable TestDeps

It looks like I forgot to reenable this test when I fixed #21522.
Update deps.go and reenable.

Change-Id: I68a45df09b418f48d93d2e7ab1d274e056c192e6
Reviewed-on: https://go-review.googlesource.com/70050
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>

diff --git a/src/cmd/dist/deps.go b/src/cmd/dist/deps.go
index 6a3d0276bbafff98a9b32bd313a712a3f35744a1..4425f7a4d99dcbee3a7288e8979ad97f383d1ebc 100644 (file)
--- a/src/cmd/dist/deps.go
+++ b/src/cmd/dist/deps.go
@@ -334,6 +334,7 @@ var builddeps = map[string][]string{
                "container/heap",       // cmd/go/internal/work
                "crypto/sha256",        // cmd/go/internal/work
                "debug/elf",            // cmd/go/internal/work
+               "encoding/json",        // cmd/go/internal/work
                "errors",               // cmd/go/internal/work
                "flag",                 // cmd/go/internal/work
                "fmt",                  // cmd/go/internal/work

diff --git a/src/cmd/dist/deps_test.go b/src/cmd/dist/deps_test.go
index 15adafa606ed90977d34f88ed2e48fce576ac5f4..596e89bfa997db13c03754dbeeab724960e92de2 100644 (file)
--- a/src/cmd/dist/deps_test.go
+++ b/src/cmd/dist/deps_test.go
@@ -15,7 +15,6 @@ import (
 )
 
 func TestDeps(t *testing.T) {
-       t.Skip("broken - golang.org/issue/21522")
        if testing.Short() && testenv.Builder() == "" {
                t.Skip("skipping in short mode")
        }