[nogo] match regexp againts relative paths (#3898)

1 files changed, 10 insertions, 0 deletions

diff --git a/go/tools/builders/nogo_main.go b/go/tools/builders/nogo_main.go
index 23acdef0..d2821774 100644
--- a/go/tools/builders/nogo_main.go
+++ b/go/tools/builders/nogo_main.go
@@ -32,6 +32,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"path/filepath"
 	"reflect"
 	"regexp"
 	"sort"
@@ -442,6 +443,10 @@ func checkAnalysisResults(actions []*action, pkg *goPackage) string {
 	}
 	var diagnostics []entry
 	var errs []error
+	cwd, err := os.Getwd()
+	if cwd == "" || err != nil {
+		errs = append(errs, fmt.Errorf("nogo failed to get CWD: %w", err))
+	}
 	for _, act := range actions {
 		if act.err != nil {
 			// Analyzer failed.
@@ -485,6 +490,11 @@ func checkAnalysisResults(actions []*action, pkg *goPackage) string {
 			if p.IsValid() {
 				filename = p.Filename
 			}
+			if cwd != "" {
+				if relname, err := filepath.Rel(cwd, filename); err == nil {
+					filename = relname
+				}
+			}
 			include := true
 			if len(currentConfig.onlyFiles) > 0 {
 				// This analyzer emits diagnostics for only a set of files.