@@ -31,9 +31,13 @@ var additionalAllowedTestModDeps = map[string]bool{
31
31
32
32
func TestCmdPkgsiteDeps (t * testing.T ) {
33
33
// First, list all dependencies of pkgsite.
34
- out , err := exec .Command ("go" , "list" , "-deps" , "golang.org/x/pkgsite/cmd/pkgsite" ).Output ()
34
+ out , err := exec .Command ("go" , "list" , "-e" , "- deps" , "golang.org/x/pkgsite/cmd/pkgsite" ).Output ()
35
35
if err != nil {
36
- t .Fatal ("running go list: " , err )
36
+ if ee , ok := err .(* exec.ExitError ); ok && len (ee .Stderr ) > 0 {
37
+ t .Fatalf ("running go list -test -deps on package golang.org/x/pkgsite/cmd/pkgsite:\n %s" , ee .Stderr )
38
+ }
39
+ t .Fatalf ("running go list -test -deps on package golang.org/x/pkgsite/cmd/pkgsite: %v" , err )
40
+
37
41
}
38
42
pkgs := strings .Fields (string (out ))
39
43
for _ , pkg := range pkgs {
@@ -43,9 +47,12 @@ func TestCmdPkgsiteDeps(t *testing.T) {
43
47
}
44
48
45
49
// Get the test module deps and check them against allowedTestModDeps.
46
- out , err := exec .Command ("go" , "list" , "-deps" , "-test" , "-f" , "{{if .Module}}{{.Module.Path}}{{end}}" , pkg ).Output ()
50
+ out , err := exec .Command ("go" , "list" , "-e" , "- deps" , "-test" , "-f" , "{{if .Module}}{{.Module.Path}}{{end}}" , pkg ).Output ()
47
51
if err != nil {
48
- t .Fatal (err )
52
+ if ee , ok := err .(* exec.ExitError ); ok && len (ee .Stderr ) > 0 {
53
+ t .Fatalf ("running go list -test -deps on package %s:\n %s" , pkg , ee .Stderr )
54
+ }
55
+ t .Fatalf ("running go list -test -deps on package %s: %v" , pkg , err )
49
56
}
50
57
testmodules := strings .Fields (string (out ))
51
58
for _ , m := range testmodules {
@@ -55,9 +62,12 @@ func TestCmdPkgsiteDeps(t *testing.T) {
55
62
}
56
63
57
64
// Get the module deps and check them against allowedModDeps
58
- out , err = exec .Command ("go" , "list" , "-deps" , "-f" , "{{if .Module}}{{.Module.Path}}{{end}}" , pkg ).Output ()
65
+ out , err = exec .Command ("go" , "list" , "-e" , "- deps" , "-f" , "{{if .Module}}{{.Module.Path}}{{end}}" , pkg ).Output ()
59
66
if err != nil {
60
- t .Fatal (err )
67
+ if ee , ok := err .(* exec.ExitError ); ok && len (ee .Stderr ) > 0 {
68
+ t .Fatalf ("running go list -deps on package %s:\n %s" , pkg , ee .Stderr )
69
+ }
70
+ t .Fatalf ("running go list -deps on package %s: %v" , pkg , err )
61
71
}
62
72
modules := strings .Fields (string (out ))
63
73
for _ , m := range modules {
0 commit comments