Skip to content

dev,bazelrc: new flag --test-build-only #108596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
knz wants to merge 1 commit into from
Closed

dev,bazelrc: new flag --test-build-only #108596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ build:nolintonbuild --nolintonbuild
# Note: nonogo is classically the name of the nolintonbuild configuration.
build:nonogo --nolintonbuild
build:test --crdb_test
build:testbuildonly --crdb_test --@io_bazel_rules_go//go/config:testbuildonly

# Basic settings.
build --define gotags=bazel,gss
Expand Down
17 changes: 15 additions & 2 deletions pkg/cmd/dev/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const (
nogoDisableFlag = "--//build/toolchains:nogo_disable_flag"
geosTarget = "//c-deps:libgeos"
devTarget = "//pkg/cmd/dev:dev"
testbuildonly = "test-build-only"
)

type buildTarget struct {
Expand Down Expand Up @@ -68,6 +69,7 @@ func makeBuildCmd(runE func(cmd *cobra.Command, args []string) error) *cobra.Com
buildCmd.Flags().String(crossFlag, "", "cross-compiles using the builder image (options: linux, linuxarm, macos, macosarm, windows)")
buildCmd.Flags().Lookup(crossFlag).NoOptDefVal = "linux"
buildCmd.Flags().StringArray(dockerArgsFlag, []string{}, "additional arguments to pass to Docker (only used for cross builds)")
buildCmd.Flags().Bool(testbuildonly, false, "only check test binaries can be built; do not link them")
addCommonBuildFlags(buildCmd)
return buildCmd
}
Expand Down Expand Up @@ -147,6 +149,7 @@ func (d *dev) build(cmd *cobra.Command, commandLine []string) error {
targets, additionalBazelArgs := splitArgsAtDash(cmd, commandLine)
ctx := cmd.Context()
cross := mustGetFlagString(cmd, crossFlag)
testbuildonly := mustGetFlagBool(cmd, testbuildonly)
dockerArgs := mustGetFlagStringArray(cmd, dockerArgsFlag)

// Set up dev cache unless it's disabled via the environment variable or the
Expand All @@ -166,7 +169,7 @@ func (d *dev) build(cmd *cobra.Command, commandLine []string) error {
}
}

args, buildTargets, err := d.getBasicBuildArgs(ctx, targets)
args, buildTargets, err := d.getBasicBuildArgsInternal(ctx, targets, testbuildonly)
if err != nil {
return err
}
Expand Down Expand Up @@ -387,6 +390,12 @@ func targetToBinBasename(target string) string {
// (e.g. after translation, so short -> "//pkg/cmd/cockroach-short").
func (d *dev) getBasicBuildArgs(
ctx context.Context, targets []string,
) (args []string, buildTargets []buildTarget, _ error) {
return d.getBasicBuildArgsInternal(ctx, targets, false)
}

func (d *dev) getBasicBuildArgsInternal(
ctx context.Context, targets []string, testbuildonly bool,
) (args []string, buildTargets []buildTarget, _ error) {
if len(targets) == 0 {
// Default to building the cockroach binary.
Expand Down Expand Up @@ -457,7 +466,11 @@ func (d *dev) getBasicBuildArgs(
}

if shouldBuildWithTestConfig {
args = append(args, "--config=test")
if testbuildonly {
args = append(args, "--config=testbuildonly")
} else {
args = append(args, "--config=test")
}
}
if canDisableNogo {
args = append(args, nogoDisableFlag)
Expand Down