[dev.boringcrypto] all: merge master into dev.boringcrypto

[gostls13.git] / src / go / build / deps_test.go

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index ff04b9e9825f708a9f29ac4ba9567aba91d9a593..08ab218610e22a2a7c3b0776c3ef7498b1133db1 100644 (file)
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -99,22 +99,23 @@ var pkgDeps = map[string][]string{
        // L3 adds reflection and some basic utility packages
        // and interface definitions, but nothing that makes
        // system calls.
-       "crypto":              {"L2", "hash"}, // interfaces
-       "crypto/cipher":       {"L2", "crypto/subtle"},
-       "crypto/subtle":       {},
-       "encoding/base32":     {"L2"},
-       "encoding/base64":     {"L2", "encoding/binary"},
-       "encoding/binary":     {"L2", "reflect"},
-       "hash":                {"L2"}, // interfaces
-       "hash/adler32":        {"L2", "hash"},
-       "hash/crc32":          {"L2", "hash"},
-       "hash/crc64":          {"L2", "hash"},
-       "hash/fnv":            {"L2", "hash"},
-       "image":               {"L2", "image/color"}, // interfaces
-       "image/color":         {"L2"},                // interfaces
-       "image/color/palette": {"L2", "image/color"},
-       "reflect":             {"L2"},
-       "sort":                {"reflect"},
+       "crypto":                 {"L2", "hash"}, // interfaces
+       "crypto/cipher":          {"L2", "crypto/subtle", "crypto/internal/subtle"},
+       "crypto/internal/subtle": {"unsafe", "reflect"}, // reflect behind a appengine tag
+       "crypto/subtle":          {},
+       "encoding/base32":        {"L2"},
+       "encoding/base64":        {"L2", "encoding/binary"},
+       "encoding/binary":        {"L2", "reflect"},
+       "hash":                   {"L2"}, // interfaces
+       "hash/adler32":           {"L2", "hash"},
+       "hash/crc32":             {"L2", "hash"},
+       "hash/crc64":             {"L2", "hash"},
+       "hash/fnv":               {"L2", "hash"},
+       "image":                  {"L2", "image/color"}, // interfaces
+       "image/color":            {"L2"},                // interfaces
+       "image/color/palette":    {"L2", "image/color"},
+       "reflect":                {"L2"},
+       "sort":                   {"reflect"},
 
        "crypto/internal/boring":         {"L2", "C", "crypto", "crypto/cipher", "crypto/internal/boring/sig", "crypto/subtle", "encoding/asn1", "hash", "math/big"},
        "crypto/internal/boring/fipstls": {"sync/atomic"},
@@ -127,6 +128,7 @@ var pkgDeps = map[string][]string{
                "crypto/cipher",
                "crypto/internal/boring",
                "crypto/internal/boring/fipstls",
+               "crypto/internal/subtle",
                "crypto/subtle",
                "encoding/base32",
                "encoding/base64",
@@ -146,7 +148,7 @@ var pkgDeps = map[string][]string{
 
        // Operating system access.
        "syscall":                           {"L0", "internal/race", "internal/syscall/windows/sysdll", "syscall/js", "unicode/utf16"},
-       "syscall/js":                        {"unsafe"},
+       "syscall/js":                        {"L0"},
        "internal/syscall/unix":             {"L0", "syscall"},
        "internal/syscall/windows":          {"L0", "syscall", "internal/syscall/windows/sysdll"},
        "internal/syscall/windows/registry": {"L0", "syscall", "internal/syscall/windows/sysdll", "unicode/utf16"},
@@ -236,49 +238,49 @@ var pkgDeps = map[string][]string{
        "go/types":                  {"L4", "GOPARSER", "container/heap", "go/constant"},
 
        // One of a kind.
-       "archive/tar":              {"L4", "OS", "syscall", "os/user"},
-       "archive/zip":              {"L4", "OS", "compress/flate"},
-       "container/heap":           {"sort"},
-       "compress/bzip2":           {"L4"},
-       "compress/flate":           {"L4"},
-       "compress/gzip":            {"L4", "compress/flate"},
-       "compress/lzw":             {"L4"},
-       "compress/zlib":            {"L4", "compress/flate"},
-       "context":                  {"errors", "fmt", "reflect", "sync", "time"},
-       "database/sql":             {"L4", "container/list", "context", "database/sql/driver", "database/sql/internal"},
-       "database/sql/driver":      {"L4", "context", "time", "database/sql/internal"},
-       "debug/dwarf":              {"L4"},
-       "debug/elf":                {"L4", "OS", "debug/dwarf", "compress/zlib"},
-       "debug/gosym":              {"L4"},
-       "debug/macho":              {"L4", "OS", "debug/dwarf"},
-       "debug/pe":                 {"L4", "OS", "debug/dwarf"},
-       "debug/plan9obj":           {"L4", "OS"},
-       "encoding":                 {"L4"},
-       "encoding/ascii85":         {"L4"},
-       "encoding/asn1":            {"L4", "math/big"},
-       "encoding/csv":             {"L4"},
-       "encoding/gob":             {"L4", "OS", "encoding"},
-       "encoding/hex":             {"L4"},
-       "encoding/json":            {"L4", "encoding"},
-       "encoding/pem":             {"L4"},
-       "encoding/xml":             {"L4", "encoding"},
-       "flag":                     {"L4", "OS"},
-       "go/build":                 {"L4", "OS", "GOPARSER"},
-       "html":                     {"L4"},
-       "image/draw":               {"L4", "image/internal/imageutil"},
-       "image/gif":                {"L4", "compress/lzw", "image/color/palette", "image/draw"},
-       "image/internal/imageutil": {"L4"},
-       "image/jpeg":               {"L4", "image/internal/imageutil"},
-       "image/png":                {"L4", "compress/zlib"},
-       "index/suffixarray":        {"L4", "regexp"},
-       "internal/singleflight":    {"sync"},
-       "internal/trace":           {"L4", "OS"},
-       "math/big":                 {"L4"},
-       "mime":                     {"L4", "OS", "syscall", "internal/syscall/windows/registry"},
-       "mime/quotedprintable":     {"L4"},
-       "net/internal/socktest":    {"L4", "OS", "syscall", "internal/syscall/windows"},
-       "net/url":                  {"L4"},
-       "plugin":                   {"L0", "OS", "CGO"},
+       "archive/tar":                    {"L4", "OS", "syscall", "os/user"},
+       "archive/zip":                    {"L4", "OS", "compress/flate"},
+       "container/heap":                 {"sort"},
+       "compress/bzip2":                 {"L4"},
+       "compress/flate":                 {"L4"},
+       "compress/gzip":                  {"L4", "compress/flate"},
+       "compress/lzw":                   {"L4"},
+       "compress/zlib":                  {"L4", "compress/flate"},
+       "context":                        {"errors", "fmt", "reflect", "sync", "time"},
+       "database/sql":                   {"L4", "container/list", "context", "database/sql/driver", "database/sql/internal"},
+       "database/sql/driver":            {"L4", "context", "time", "database/sql/internal"},
+       "debug/dwarf":                    {"L4"},
+       "debug/elf":                      {"L4", "OS", "debug/dwarf", "compress/zlib"},
+       "debug/gosym":                    {"L4"},
+       "debug/macho":                    {"L4", "OS", "debug/dwarf", "compress/zlib"},
+       "debug/pe":                       {"L4", "OS", "debug/dwarf", "compress/zlib"},
+       "debug/plan9obj":                 {"L4", "OS"},
+       "encoding":                       {"L4"},
+       "encoding/ascii85":               {"L4"},
+       "encoding/asn1":                  {"L4", "math/big"},
+       "encoding/csv":                   {"L4"},
+       "encoding/gob":                   {"L4", "OS", "encoding"},
+       "encoding/hex":                   {"L4"},
+       "encoding/json":                  {"L4", "encoding"},
+       "encoding/pem":                   {"L4"},
+       "encoding/xml":                   {"L4", "encoding"},
+       "flag":                           {"L4", "OS"},
+       "go/build":                       {"L4", "OS", "GOPARSER"},
+       "html":                           {"L4"},
+       "image/draw":                     {"L4", "image/internal/imageutil"},
+       "image/gif":                      {"L4", "compress/lzw", "image/color/palette", "image/draw"},
+       "image/internal/imageutil":       {"L4"},
+       "image/jpeg":                     {"L4", "image/internal/imageutil"},
+       "image/png":                      {"L4", "compress/zlib"},
+       "index/suffixarray":              {"L4", "regexp"},
+       "internal/singleflight":          {"sync"},
+       "internal/trace":                 {"L4", "OS"},
+       "math/big":                       {"L4"},
+       "mime":                           {"L4", "OS", "syscall", "internal/syscall/windows/registry"},
+       "mime/quotedprintable":           {"L4"},
+       "net/internal/socktest":          {"L4", "OS", "syscall", "internal/syscall/windows"},
+       "net/url":                        {"L4"},
+       "plugin":                         {"L0", "OS", "CGO"},
        "runtime/pprof/internal/profile": {"L4", "OS", "compress/gzip", "regexp"},
        "testing/internal/testdeps":      {"L4", "internal/testlog", "runtime/pprof", "regexp"},
        "text/scanner":                   {"L4", "OS"},
@@ -423,7 +425,7 @@ var pkgDeps = map[string][]string{
                "syscall/js",
        },
        "net/http/internal":  {"L4"},
-       "net/http/httptrace": {"context", "crypto/tls", "internal/nettrace", "net", "reflect", "time"},
+       "net/http/httptrace": {"context", "crypto/tls", "internal/nettrace", "net", "net/textproto", "reflect", "time"},
 
        // HTTP-using packages.
        "expvar":             {"L4", "OS", "encoding/json", "net/http"},