Skip to content

Commit 461ed2b

Browse files
committed
Fix src_location_ut and src_root_ut (#164)
1 parent e3f91c8 commit 461ed2b

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

util/CMakeLists.txt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@ if (YDB_SDK_TESTS)
221221
cpu_id_ut
222222
daemon_ut
223223
datetime_ut
224-
# TODO: direct_io_ut freezes
224+
# TODO: fix direct_io_ut
225+
# TDirectIoErrorHandling::Constructor: did not throw any exception (expected TFileError)
225226
direct_io_ut
226227
env_ut
227228
error_ut
@@ -255,11 +256,7 @@ if (YDB_SDK_TESTS)
255256
shellcommand_ut
256257
shmat_ut
257258
spinlock_ut
258-
# TODO: fix src_location_ut
259-
# TestLocation::Test1
260259
src_location_ut
261-
# TODO: fix src_root_ut
262-
# TestSourceRoot::TestStrip
263260
src_root_ut
264261
tempfile_ut
265262
# TODO: fix thread_ut
@@ -268,7 +265,7 @@ if (YDB_SDK_TESTS)
268265
tls_ut
269266
# TODO: fix type_name_ut
270267
# TypeName::FromWellKnownTypes
271-
# TypeName::FromWellKnownValues
268+
# TypeName::FromArcadiaTypes
272269
# TypeName::FromWellKnownValues
273270
type_name_ut
274271
types_ut
@@ -674,9 +671,10 @@ elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
674671
)
675672
endif()
676673

674+
# These definitions are needed to `util/system/src_root.h` works properly
677675
target_compile_definitions(yutil PUBLIC
678-
ARCADIA_ROOT_CMAKE_HELPER=${YDB_SDK_SOURCE_DIR}
679-
ARCADIA_BUILD_ROOT_CMAKE_HELPER=${YDB_SDK_BINARY_DIR}
676+
ARCADIA_ROOT=${YDB_SDK_SOURCE_DIR}
677+
ARCADIA_BUILD_ROOT=${YDB_SDK_BINARY_DIR}
680678
)
681679

682680
_ydb_sdk_install_targets(TARGETS yutil)

0 commit comments

Comments
 (0)