Skip to content

Commit

Permalink
Support projects using go modules
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Godkin authored and williammartin committed Mar 7, 2019
1 parent 75b9920 commit d56ee76
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions ginkgo/run_watch_and_build_command_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ func (c *RunWatchAndBuildCommandFlags) flags(mode int) {
c.FlagSet.BoolVar(c.boolSlot("work"), "work", false, "Print the name of the temporary work directory and do not delete it when exiting.")
c.FlagSet.StringVar(c.stringSlot("asmflags"), "asmflags", "", "Arguments to pass on each go tool asm invocation.")
c.FlagSet.StringVar(c.stringSlot("buildmode"), "buildmode", "", "Build mode to use. See 'go help buildmode' for more.")
c.FlagSet.StringVar(c.stringSlot("mod"), "mod", "", "Go module control. See 'go help modules' for more.")
c.FlagSet.StringVar(c.stringSlot("compiler"), "compiler", "", "Name of compiler to use, as in runtime.Compiler (gccgo or gc).")
c.FlagSet.StringVar(c.stringSlot("gccgoflags"), "gccgoflags", "", "Arguments to pass on each gccgo compiler/linker invocation.")
c.FlagSet.StringVar(c.stringSlot("installsuffix"), "installsuffix", "", "A suffix to use in the name of the package installation directory.")
Expand Down
1 change: 1 addition & 0 deletions ginkgo/testrunner/test_runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ func (t *TestRunner) BuildArgs(path string) []string {
"coverpkg",
"tags",
"gcflags",
"mod",
}

for _, opt := range stringOpts {
Expand Down
2 changes: 2 additions & 0 deletions ginkgo/testrunner/test_runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ var _ = Describe("TestRunner", func() {
"coverpkg": strAddr(""),
"cover": boolAddr(false),
"blockprofilerate": intAddr(100),
"mod": strAddr("vendor"),
}
tr := testrunner.New(testsuite.TestSuite{}, 1, false, 0, opts, []string{})

Expand All @@ -50,6 +51,7 @@ var _ = Describe("TestRunner", func() {
"-asmflags=a",
"-pkgdir=b",
"-gcflags=c",
"-mod=vendor",
}))
})
})
Expand Down

0 comments on commit d56ee76

Please sign in to comment.