dashboard: add makeScriptArgs for fine control over make script args
When a port is restored after being marked as broken, its builder won't
be able to test the port unless the -force flag is passed to make.bash.
This change makes it possible to configure such builders as so:
makeScriptArgs: []string{
// TODO(go.dev/issue/nnn): Temporarily force build
// until the port is no longer marked as broken.
"-force",
},
To see test results before the port is no longer marked as broken.
This change stops reusing the value of allScriptArgs for make.bash args.
That doesn't break anything since only the misc-compile builders have a
non-empty allScriptArgs set, and that value is needed for buildall.bash,
not for make.bash.
For golang/go#56679.
Change-Id: I6b7a51a7dc1a00674bae4bddf4fca5c96c06fa15
Reviewed-on: https://go-review.googlesource.com/c/build/+/458517
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index db47ea2..8de40a2 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -854,8 +854,9 @@
numTestHelpers int
numTryTestHelpers int // For TryBots/SlowBots. If 0, numTestHelpers is used.
- env []string // extra environment ("key=value") pairs
- allScriptArgs []string
+ env []string // extra environment ("key=value") pairs
+ makeScriptArgs []string // extra args to pass to the make.bash-equivalent script
+ allScriptArgs []string // extra args to pass to the all.bash-equivalent script
testHostConf *HostConfig // override HostConfig for testing, at least for now
@@ -1276,7 +1277,7 @@
// MakeScriptArgs returns the set of arguments that should be passed to the
// make.bash-equivalent script. Usually empty.
func (c *BuildConfig) MakeScriptArgs() []string {
- return c.AllScriptArgs()
+ return append([]string(nil), c.makeScriptArgs...)
}
// GorootFinal returns the default install location for
