diff options
Diffstat (limited to 'libgo/go/cmd/go/internal/test/test.go')
| -rw-r--r-- | libgo/go/cmd/go/internal/test/test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libgo/go/cmd/go/internal/test/test.go b/libgo/go/cmd/go/internal/test/test.go index 95000011d83..fb011d4c03f 100644 --- a/libgo/go/cmd/go/internal/test/test.go +++ b/libgo/go/cmd/go/internal/test/test.go @@ -572,8 +572,9 @@ func runTest(cmd *base.Command, args []string) { } // Pass timeout to tests if it exists. + // Prepend rather than appending so that it appears before positional arguments. if testActualTimeout > 0 { - testArgs = append(testArgs, "-test.timeout="+testActualTimeout.String()) + testArgs = append([]string{"-test.timeout=" + testActualTimeout.String()}, testArgs...) } // show passing test output (after buffering) with -v flag. @@ -828,7 +829,7 @@ func builderTest(b *work.Builder, p *load.Package) (buildAction, runAction, prin if p.ImportPath == "command-line-arguments" { elem = p.Name } else { - elem = load.DefaultExecName(p.ImportPath) + elem = p.DefaultExecName() } testBinary := elem + ".test" |