Prettify ya.make

5 files changed, 18 insertions, 40 deletions

diff --git a/.mapping.json b/.mapping.json
index d29890b199..44b8d55c91 100644
--- a/.mapping.json
+++ b/.mapping.json
@@ -7580,7 +7580,6 @@
   "ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.linux-aarch64.txt":"",
   "ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.linux-x86_64.txt":"",
   "ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.txt":"",
-  "ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.windows-x86_64.txt":"",
   "ydb/library/yql/providers/dq/interface/CMakeLists.darwin-x86_64.txt":"",
   "ydb/library/yql/providers/dq/interface/CMakeLists.linux-aarch64.txt":"",
   "ydb/library/yql/providers/dq/interface/CMakeLists.linux-x86_64.txt":"",
diff --git a/ydb/library/yql/providers/dq/global_worker_manager/CMakeLists.windows-x86_64.txt b/ydb/library/yql/providers/dq/global_worker_manager/CMakeLists.windows-x86_64.txt
index 6d9c10aa31..b0fa44cd91 100644
--- a/ydb/library/yql/providers/dq/global_worker_manager/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/providers/dq/global_worker_manager/CMakeLists.windows-x86_64.txt
@@ -6,7 +6,6 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(ut)
 
 add_library(providers-dq-global_worker_manager)
 target_compile_options(providers-dq-global_worker_manager PRIVATE
diff --git a/ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.txt b/ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.txt
index f8b31df0c1..606ff46b4b 100644
--- a/ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.txt
+++ b/ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.txt
@@ -10,8 +10,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarc
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   include(CMakeLists.darwin-x86_64.txt)
-elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
-  include(CMakeLists.windows-x86_64.txt)
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
   include(CMakeLists.linux-x86_64.txt)
 endif()
diff --git a/ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.windows-x86_64.txt b/ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.windows-x86_64.txt
deleted file mode 100644
index a2c865ae35..0000000000
--- a/ydb/library/yql/providers/dq/global_worker_manager/ut/CMakeLists.windows-x86_64.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-
-add_library(dq-global_worker_manager-ut INTERFACE)
-target_link_libraries(dq-global_worker_manager-ut INTERFACE
-  contrib-libs-cxxsupp
-  yutil
-)
diff --git a/ydb/library/yql/providers/dq/global_worker_manager/ut/ya.make b/ydb/library/yql/providers/dq/global_worker_manager/ut/ya.make
index b67eba48b8..232ffcaec7 100644
--- a/ydb/library/yql/providers/dq/global_worker_manager/ut/ya.make
+++ b/ydb/library/yql/providers/dq/global_worker_manager/ut/ya.make
@@ -1,29 +1,25 @@
-IF (NOT OS_WINDOWS)
-    UNITTEST_FOR(ydb/library/yql/providers/dq/global_worker_manager)
+UNITTEST_FOR(ydb/library/yql/providers/dq/global_worker_manager)
 
-    SIZE(SMALL)
+NO_BUILD_IF(OS_WINDOWS)
 
-    PEERDIR(
-        library/cpp/actors/testlib
-        ydb/library/yql/public/udf/service/stub
-        ydb/library/yql/sql/pg_dummy
-        ydb/library/yql/providers/dq/actors/yt
-        ydb/library/yql/providers/dq/actors
-        ydb/library/yql/dq/actors/compute
-    )
+SIZE(SMALL)
 
-    SRCS(
-        global_worker_manager_ut.cpp
-        workers_storage_ut.cpp
-    )
+PEERDIR(
+    library/cpp/actors/testlib
+    ydb/library/yql/public/udf/service/stub
+    ydb/library/yql/sql/pg_dummy
+    ydb/library/yql/providers/dq/actors/yt
+    ydb/library/yql/providers/dq/actors
+    ydb/library/yql/dq/actors/compute
+)
 
-    INCLUDE(${ARCADIA_ROOT}/ydb/tests/supp/ubsan_supp.inc)
+SRCS(
+    global_worker_manager_ut.cpp
+    workers_storage_ut.cpp
+)
 
-    YQL_LAST_ABI_VERSION()
+INCLUDE(${ARCADIA_ROOT}/ydb/tests/supp/ubsan_supp.inc)
 
-    END()
-ELSE()
-    LIBRARY()
+YQL_LAST_ABI_VERSION()
 
-    END()
-ENDIF()
+END()