From fd0acc4faf41c1945cfefba640a8cc56a01abbf3 Mon Sep 17 00:00:00 2001 From: Nick Khyl Date: Fri, 12 Jul 2024 14:59:35 -0500 Subject: [PATCH] cmd/cloner, cmd/viewer: add _test prefix for files generated with the test build tag Updates #12736 Signed-off-by: Nick Khyl --- cmd/cloner/cloner.go | 6 +++++- cmd/viewer/viewer.go | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/cloner/cloner.go b/cmd/cloner/cloner.go index b4e940b2d..db354af3b 100644 --- a/cmd/cloner/cloner.go +++ b/cmd/cloner/cloner.go @@ -78,7 +78,11 @@ func main() { w(" return false") w("}") } - cloneOutput := pkg.Name + "_clone.go" + cloneOutput := pkg.Name + "_clone" + if *flagBuildTags == "test" { + cloneOutput += "_test" + } + cloneOutput += ".go" if err := codegen.WritePackageFile("tailscale.com/cmd/cloner", pkg, cloneOutput, it, buf); err != nil { log.Fatal(err) } diff --git a/cmd/viewer/viewer.go b/cmd/viewer/viewer.go index 557b6e459..d2be6af66 100644 --- a/cmd/viewer/viewer.go +++ b/cmd/viewer/viewer.go @@ -459,7 +459,11 @@ func main() { } genView(buf, it, typ, pkg.Types) } - out := pkg.Name + "_view.go" + out := pkg.Name + "_view" + if *flagBuildTags == "test" { + out += "_test" + } + out += ".go" if err := codegen.WritePackageFile("tailscale/cmd/viewer", pkg, out, it, buf); err != nil { log.Fatal(err) }