Skip to content

Commit

Permalink
Merge #54614
Browse files Browse the repository at this point in the history
54614: logictest: switch high vmodule nightly tests to use make test r=tbg a=asubiotto

make testlogic would build the testing binary first and then invoke it
manually, losing test JSON output and therefore creating parsing issues. The
switch to make test changes this nightly test to emit expected JSON output.

Release note: None

Fixes #50136

Co-authored-by: Alfonso Subiotto Marques <[email protected]>
  • Loading branch information
craig[bot] and asubiotto committed Sep 21, 2020
2 parents d6f9163 + f779ec0 commit 3202b17
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/teamcity-testlogic-verbose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ tc_end_block "Compile C dependencies"
tc_start_block "Run TestLogic tests under verbose"
run_json_test build/builder.sh \
stdbuf -oL -eL \
make testlogic GOTESTFLAGS=-json TESTTIMEOUT=1h TESTFLAGS='--vmodule=*=10 -show-sql -test.v'
make test GOTESTFLAGS=-json TESTFLAGS='--vmodule=*=10 -show-sql -test.v' TESTTIMEOUT='1h' PKG='./pkg/sql/logictest' TESTS='^TestLogic$$'
tc_end_block "Run TestLogic tests under verbose"

0 comments on commit 3202b17

Please sign in to comment.