Fix tests for go.mod files

Author: Sauyon Lee

extractor/cli/go-build-runner/go-build-runner.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"github.com/github/codeql-go/extractor/util"
+	"log"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+
+	"github.com/github/codeql-go/extractor/autobuilder"
+)
+
+func main() {
+	// check if a build command has successfully extracted something
+	autobuilder.CheckExtracted = true
+	if autobuilder.Autobuild() {
+		return
+	}
+
+	// if the autobuilder fails, invoke the extractor manually
+	// we cannot simply call `go build` here, because the tracer is not able to trace calls made by
+	// this binary
+	log.Printf("No build commands succeeded, falling back to go build ./...")
+
+	mypath, err := os.Executable()
+	if err != nil {
+		log.Fatalf("Could not determine path of extractor: %v.\n", err)
+	}
+	extractor := filepath.Join(filepath.Dir(mypath), "go-extractor")
+	if runtime.GOOS == "windows" {
+		extractor = extractor + ".exe"
+	}
+
+	util.RunCmd(exec.Command(extractor, "./..."))
+}

ql/test/extractor-tests/go-mod-comments/stub.go

@@ -0,0 +1,3 @@
+package main
+
+func main() {}

ql/test/library-tests/semmle/go/GoModExpr/ExcludeLines.expected

@@ -1,3 +1,2 @@
-| pkg1/go.mod:10:1:10:44 | go.mod exclude line | codeql-go-tests/gomod/dep1 | github.com/github/codeql-go | v1.23.1 |
-| pkg2/go.mod:15:2:15:35 | go.mod exclude line | codeql-go-tests/gomod/dep2 | github.com/sirupsen/logrus | v1.4.2 |
-| pkg2/go.mod:16:2:16:37 | go.mod exclude line | codeql-go-tests/gomod/dep2 | github.com/github/codeql-go | v1.23.1 |
+| go.mod:10:1:10:44 | go.mod exclude line | codeql-go-tests/gomod | github.com/github/codeql-go | v1.23.1 |
+| go.mod:23:1:23:42 | go.mod exclude line | codeql-go-tests/gomod | github.com/sirupsen/logrus | v1.4.2 |

ql/test/library-tests/semmle/go/GoModExpr/ReplaceLines.expected

@@ -1,2 +1,2 @@
-| pkg2/go.mod:5:1:5:55 | go.mod replace line | codeql-go-tests/gomod/dep2 | github.com/Masterminds/squirrel | no version | ../squirrel | no version |
-| pkg2/go.mod:6:1:6:79 | go.mod replace line | codeql-go-tests/gomod/dep2 | github.com/Sirupsen/logrus | v1.4.1 | github.com/sirupsen/logrus | v1.4.1 |
+| go.mod:12:1:12:54 | go.mod replace line | codeql-go-tests/gomod | github.com/Masterminds/squirrel | no version | ./squirrel | no version |
+| go.mod:14:1:14:79 | go.mod replace line | codeql-go-tests/gomod | github.com/Sirupsen/logrus | v1.4.1 | github.com/sirupsen/logrus | v1.4.1 |

ql/test/library-tests/semmle/go/GoModExpr/RequireLines.expected

@@ -1,5 +1,5 @@
-| pkg1/go.mod:6:2:6:67 | go.mod require line | codeql-go-tests/gomod/dep1 | github.com/github/codeql-go | v1.23.2-0.20200302182241-5e71a04fdf30 |
-| pkg1/go.mod:7:2:7:55 | go.mod require line | codeql-go-tests/gomod/dep1 | golang.org/x/tools | v0.0.0-20200109174759-ac4f524c1612 |
-| pkg2/go.mod:8:1:8:38 | go.mod require line | codeql-go-tests/gomod/dep2 | github.com/gorilla/mux | v1.7.4 |
-| pkg2/go.mod:10:2:10:35 | go.mod require line | codeql-go-tests/gomod/dep2 | github.com/Sirupsen/logrus | v1.4.1 |
-| pkg2/go.mod:11:2:11:40 | go.mod require line | codeql-go-tests/gomod/dep2 | github.com/Masterminds/squirrel | v1.2.0 |
+| go.mod:6:2:6:67 | go.mod require line | codeql-go-tests/gomod | github.com/github/codeql-go | v1.23.2-0.20200302182241-5e71a04fdf30 |
+| go.mod:7:2:7:55 | go.mod require line | codeql-go-tests/gomod | golang.org/x/tools | v0.0.0-20200109174759-ac4f524c1612 |
+| go.mod:16:1:16:38 | go.mod require line | codeql-go-tests/gomod | github.com/gorilla/mux | v1.7.4 |
+| go.mod:19:2:19:40 | go.mod require line | codeql-go-tests/gomod | github.com/Masterminds/squirrel | v1.2.0 |
+| go.mod:20:2:20:35 | go.mod require line | codeql-go-tests/gomod | github.com/Sirupsen/logrus | v1.4.1 |

ql/test/library-tests/semmle/go/GoModExpr/go.mod

@@ -0,0 +1,23 @@
+module codeql-go-tests/gomod
+
+go 1.14
+
+require (
+	github.com/github/codeql-go v1.23.2-0.20200302182241-5e71a04fdf30 // indirect
+	golang.org/x/tools v0.0.0-20200109174759-ac4f524c1612 // indirect
+)
+
+exclude github.com/github/codeql-go v1.23.1
+
+replace github.com/Masterminds/squirrel => ./squirrel
+
+replace github.com/Sirupsen/logrus v1.4.1 => github.com/sirupsen/logrus v1.4.1
+
+require github.com/gorilla/mux v1.7.4 // indirect
+
+require (
+	github.com/Masterminds/squirrel v1.2.0 // indirect
+	github.com/Sirupsen/logrus v1.4.1 // indirect
+)
+
+exclude github.com/sirupsen/logrus v1.4.2