mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tstest/integration: set race flag when cross compiling, conditionally fail on race 

Misc cleanups and things noticed while working on #7894 and pulled out
of a separate change. Submitting them on their own to not distract
from later changes.

Updates #7894

Change-Id: Ie9abc8b88f121c559aeeb7e74db2aa532eb84d3d
Co-authored-by: Maisem Ali <maisem@tailscale.com>
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2023-10-13 19:22:36 -07:00 committed by Brad Fitzpatrick
parent 8c7169105e
commit 5c555cdcbb
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tstest/integration/integration.go
View File

@ -117,7 +117,11 @@ func build(outDir string, targets ...string) error {
// Fallback slow path for cross-compiled binaries. // Fallback slow path for cross-compiled binaries.
for _, target := range targets { for _, target := range targets {
outFile := filepath.Join(outDir, path.Base(target)+exe()) outFile := filepath.Join(outDir, path.Base(target)+exe())
cmd := exec.Command(goBin, "build", "-o", outFile, target) cmd := exec.Command(goBin, "build", "-o", outFile)
if version.IsRace() {
cmd.Args = append(cmd.Args, "-race")
}
cmd.Args = append(cmd.Args, target)
cmd.Env = append(os.Environ(), "GOARCH="+runtime.GOARCH) cmd.Env = append(os.Environ(), "GOARCH="+runtime.GOARCH)
if errOut, err := cmd.CombinedOutput(); err != nil { if errOut, err := cmd.CombinedOutput(); err != nil {
return fmt.Errorf("failed to build %v with %v: %v, %s", target, goBin, err, errOut) return fmt.Errorf("failed to build %v with %v: %v, %s", target, goBin, err, errOut)

7
tstest/integration/integration_test.go
View File

@ -42,6 +42,7 @@ import (
"tailscale.com/types/key" "tailscale.com/types/key"
"tailscale.com/types/logger" "tailscale.com/types/logger"
"tailscale.com/util/rands" "tailscale.com/util/rands"
"tailscale.com/version"
) )
var ( var (
@ -1065,6 +1066,12 @@ func (n *testNode) StartDaemonAsIPNGOOS(ipnGOOS string) *Daemon {
"TS_LOGS_DIR="+t.TempDir(), "TS_LOGS_DIR="+t.TempDir(),
"TS_NETCHECK_GENERATE_204_URL="+n.env.ControlServer.URL+"/generate_204", "TS_NETCHECK_GENERATE_204_URL="+n.env.ControlServer.URL+"/generate_204",
) )
if version.IsRace() {
const knownBroken = true // TODO(bradfitz,maisem): enable this once we fix all the races :(
if !knownBroken {
cmd.Env = append(cmd.Env, "GORACE=halt_on_error=1")
}
}
cmd.Stderr = &nodeOutputParser{n: n} cmd.Stderr = &nodeOutputParser{n: n}
if *verboseTailscaled { if *verboseTailscaled {
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout