Skip to content
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.

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

logictest: add TestLogic_tmp for testing untracked logic test files #85386

Merged
merged 1 commit into from
Aug 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dev
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fi
set -euo pipefail

# Bump this counter to force rebuilding `dev` on all machines.
DEV_VERSION=50
DEV_VERSION=51

THIS_DIR=$(cd "$(dirname "$0")" && pwd)
BINARY_DIR=$THIS_DIR/bin/dev-versions
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions pkg/ccl/logictestccl/tests/5node/generated_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions pkg/ccl/logictestccl/tests/fakedist-disk/generated_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions pkg/ccl/logictestccl/tests/fakedist-vec-off/generated_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions pkg/ccl/logictestccl/tests/fakedist/generated_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions pkg/ccl/logictestccl/tests/local-mixed-21.2-22.1/generated_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions pkg/ccl/logictestccl/tests/local-vec-off/generated_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions pkg/ccl/logictestccl/tests/local/generated_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 0 additions & 24 deletions pkg/cmd/dev/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ const (
stressArgsFlag = "stress-args"
raceFlag = "race"
ignoreCacheFlag = "ignore-cache"
noGenFlag = "no-gen"
rewriteFlag = "rewrite"
streamOutputFlag = "stream-output"
testArgsFlag = "test-args"
Expand Down Expand Up @@ -102,7 +101,6 @@ pkg/kv/kvserver:kvserver_test) instead.`,
testCmd.Flags().Bool(raceFlag, false, "run tests using race builds")
testCmd.Flags().Bool(ignoreCacheFlag, false, "ignore cached test runs")
testCmd.Flags().Bool(rewriteFlag, false, "rewrite test files using results from test run (only applicable to certain tests)")
testCmd.Flags().Bool(noGenFlag, false, "skip generating logic test files before running logic tests")
testCmd.Flags().Bool(streamOutputFlag, false, "stream test output during run")
testCmd.Flags().String(testArgsFlag, "", "additional arguments to pass to the go test binary")
testCmd.Flags().String(vModuleFlag, "", "comma-separated list of pattern=N settings for file-filtered logging")
Expand All @@ -125,7 +123,6 @@ func (d *dev) test(cmd *cobra.Command, commandLine []string) error {
stressCmdArgs = mustGetFlagString(cmd, stressArgsFlag)
timeout = mustGetFlagDuration(cmd, timeoutFlag)
verbose = mustGetFlagBool(cmd, vFlag)
noGen = mustGetFlagBool(cmd, noGenFlag)
changed = mustGetFlagBool(cmd, changedFlag)
showLogs = mustGetFlagBool(cmd, showLogsFlag)
count = mustGetFlagInt(cmd, countFlag)
Expand Down Expand Up @@ -222,27 +219,6 @@ func (d *dev) test(cmd *cobra.Command, commandLine []string) error {
}
args = append(args, "--test_env=GOTRACEBACK=all")

// We need to re-generate logictest files if we're testing a
// logictest target.
if !noGen {
var shouldGenerateLogicTestFiles bool
for _, testTarget := range testTargets {
for _, logicTestPath := range logicTestPaths {
if strings.Contains(testTarget, logicTestPath) {
shouldGenerateLogicTestFiles = true
break
}
}
}

if shouldGenerateLogicTestFiles {
err := d.generateLogicTest(cmd)
if err != nil {
return err
}
}
}

if rewrite {
if stress {
return fmt.Errorf("cannot combine --%s and --%s", stressFlag, rewriteFlag)
Expand Down
1 change: 1 addition & 0 deletions pkg/cmd/dev/testlogic.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const (
subtestsFlag = "subtests"
configFlag = "config"
showSQLFlag = "show-sql"
noGenFlag = "no-gen"
)

func makeTestLogicCmd(runE func(cmd *cobra.Command, args []string) error) *cobra.Command {
Expand Down
Loading