commit 3ac76b8bb7987237f88545d31e5be0c1acae3240
author pjw <pjw@google.com> Mon Apr 05 07:27:44 2021 -0400
committer Peter Weinberger <pjw@google.com> Wed Apr 07 10:44:45 2021 +0000
tree 465907d5c3e969491f99b9031f974a2aa0026e60
parent c6024661546ed472512ea81b88b7963a3ca5b3e8

gopls/internal/coverage: better error messages and output

First test that it's being run from the tools module's root, and then
that the directory structure is ok.

Fix the formatting of verbose output.

Change-Id: Icd27fb24277ca80069da12825ea60fc30ff399b8
Reviewed-on: https://go-review.googlesource.com/c/tools/+/307269
Run-TryBot: Peter Weinberger <pjw@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Peter Weinberger <pjw@google.com>
Reviewed-by: Robert Findley <rfindley@google.com>

gopls/internal/coverage/coverage.go

diff --git a/gopls/internal/coverage/coverage.go b/gopls/internal/coverage/coverage.go
index e5d17f3..c3d30c6 100644
--- a/gopls/internal/coverage/coverage.go
+++ b/gopls/internal/coverage/coverage.go
@@ -175,17 +175,17 @@
 func maybePrint(m result) {
 	switch m.Action {
 	case "pass", "fail", "skip":
-		fmt.Printf("%s %s %.3f", m.Action, m.Test, m.Elapsed)
+		fmt.Printf("%s %s %.3f\n", m.Action, m.Test, m.Elapsed)
 	case "run":
 		if *verbose > 2 {
-			fmt.Printf("%s %s %.3f", m.Action, m.Test, m.Elapsed)
+			fmt.Printf("%s %s %.3f\n", m.Action, m.Test, m.Elapsed)
 		}
 	case "output":
 		if *verbose > 3 {
-			fmt.Printf("%s %s %q %.3f", m.Action, m.Test, m.Output, m.Elapsed)
+			fmt.Printf("%s %s %q %.3f\n", m.Action, m.Test, m.Output, m.Elapsed)
 		}
 	default:
-		log.Fatalf("unknown action %s", m.Action)
+		log.Fatalf("unknown action %s\n", m.Action)
 	}
 }
 
@@ -224,16 +224,7 @@
 	if err != nil {
 		log.Fatal(err)
 	}
-	// we expect gopls and internal/lsp as subdirectories
-	_, err = os.Stat("gopls")
-	if err != nil {
-		log.Fatalf("expected a gopls directory, %v", err)
-	}
-	_, err = os.Stat("internal/lsp")
-	if err != nil {
-		log.Fatalf("expected to see internal/lsp, %v", err)
-	}
-	// and we expect to be a the root of golang.org/x/tools
+	// we expect to be a the root of golang.org/x/tools
 	cmd := exec.Command("go", "list", "-m", "-f", "{{.Dir}}", "golang.org/x/tools")
 	buf, err := cmd.Output()
 	buf = bytes.Trim(buf, "\n \t") // remove \n at end
@@ -241,7 +232,16 @@
 		log.Fatal(err)
 	}
 	if string(buf) != dir {
-		log.Fatalf("got %q, wanted %q", dir, string(buf))
+		log.Fatalf("wrong directory: in %q, should be in %q", dir, string(buf))
+	}
+	// and we expect gopls and internal/lsp as subdirectories
+	_, err = os.Stat("gopls")
+	if err != nil {
+		log.Fatalf("expected a gopls directory, %v", err)
+	}
+	_, err = os.Stat("internal/lsp")
+	if err != nil {
+		log.Fatalf("expected to see internal/lsp, %v", err)
 	}
 }