From a2066ea1fad314acc9d02f10ec73813a6f047f84 Mon Sep 17 00:00:00 2001 From: Deepthi Srinivasan Date: Fri, 3 Feb 2023 15:07:31 +0000 Subject: [PATCH] [#15919] YSQL: Enable initial system catalog generation for TSAN builds 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 --- src/yb/yql/pgwrapper/CMakeLists.txt | 14 +++----------- .../create_initial_sys_catalog_snapshot.cc | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/yb/yql/pgwrapper/CMakeLists.txt b/src/yb/yql/pgwrapper/CMakeLists.txt index 6d826b72716..69792161aa7 100644 --- a/src/yb/yql/pgwrapper/CMakeLists.txt +++ b/src/yb/yql/pgwrapper/CMakeLists.txt @@ -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 diff --git a/src/yb/yql/pgwrapper/create_initial_sys_catalog_snapshot.cc b/src/yb/yql/pgwrapper/create_initial_sys_catalog_snapshot.cc index 511840c90ee..5783c14f4bd 100644 --- a/src/yb/yql/pgwrapper/create_initial_sys_catalog_snapshot.cc +++ b/src/yb/yql/pgwrapper/create_initial_sys_catalog_snapshot.cc @@ -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. }