Skip to content

Commit

Permalink
[#15919] YSQL: Enable initial system catalog generation for TSAN builds
Browse files Browse the repository at this point in the history
Summary: In this patch, enable system catalog generation for TSAN builds. The actual tests will be enabled for TSAN in a separate patch after a few additional fixes have been made.

Test Plan: Jenkins: test regex: .*CreateInitialSysCatalogSnapshot.*

Reviewers: mbautin

Reviewed By: mbautin

Subscribers: ybase, yql

Differential Revision: https://phabricator.dev.yugabyte.com/D22723
  • Loading branch information
Deepthi Srinivasan committed Feb 8, 2023
1 parent e459e7e commit a2066ea
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
14 changes: 3 additions & 11 deletions src/yb/yql/pgwrapper/CMakeLists.txt
Expand Up @@ -130,17 +130,9 @@ if(NOT "${YB_DYNAMICALLY_LINKED_EXE_SUFFIX}" STREQUAL "")
"--dynamically_linked_exe_suffix=${YB_DYNAMICALLY_LINKED_EXE_SUFFIX}")
endif()

if ("${YB_BUILD_TYPE}" STREQUAL "tsan")
# Don't build the initial sys catalog snapshot target automatically in TSAN. But still create the
# target so it could be built explicitly.
add_custom_target(
initial_sys_catalog_snapshot # Don't add "ALL" here.
COMMAND ${gen_initial_sys_catalog_snapshot_cmd})
else()
add_custom_target(
initial_sys_catalog_snapshot ALL
COMMAND ${gen_initial_sys_catalog_snapshot_cmd})
endif()
add_custom_target(
initial_sys_catalog_snapshot ALL
COMMAND ${gen_initial_sys_catalog_snapshot_cmd})

add_dependencies(
initial_sys_catalog_snapshot
Expand Down
Expand Up @@ -55,7 +55,7 @@ class CreateInitialSysCatalogSnapshotTest : public PgWrapperTestBase {
};

TEST_F(CreateInitialSysCatalogSnapshotTest,
YB_DISABLE_TEST_IN_TSAN(CreateInitialSysCatalogSnapshot)) {
CreateInitialSysCatalogSnapshot) {
// All the work is done by the master on cluster startup.
}

Expand Down

0 comments on commit a2066ea

Please sign in to comment.