Fix userver_module command formatting

Author: idzm

.cmake-format.py

@@ -19,8 +19,14 @@
                 "INCLUDE_DIRS": "*",
                 "DBTEST_SOURCES": "*",
                 "DBTEST_DATABASES": "*",
+                "DBTEST_ENV": "*",
                 "UBENCH_DIRS": "*",
                 "UBENCH_DATABASES": "*",
+                "UBENCH_SOURCES": "*",
+                "UBENCH_LINK_LIBRARIES": "*",
+                "UBENCH_ENV" : "*",
+                "POSTGRES_TEST_DSN" : "*",
+
             },
             "flags": ["NO_INSTALL"],
         },

kafka/CMakeLists.txt

@@ -11,13 +11,10 @@ userver_module(
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
     LINK_LIBRARIES_PRIVATE RdKafka::rdkafka DBTEST_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/tests" DBTEST_LINK_LIBRARIES
                            userver::kafka-utest
-    DBTEST_DATABASES
-        kafka
-        DBTEST_ENV
-        "TESTSUITE_KAFKA_SERVER_START_TIMEOUT=120.0"
-        "TESTSUITE_KAFKA_SERVER_HOST=[::1]"
-        "TESTSUITE_KAFKA_SERVER_PORT=8099"
-        "TESTSUITE_KAFKA_CONTROLLER_PORT=8100"
+    DBTEST_DATABASES kafka
+    DBTEST_ENV
+        "TESTSUITE_KAFKA_SERVER_START_TIMEOUT=120.0" "TESTSUITE_KAFKA_SERVER_HOST=[::1]"
+        "TESTSUITE_KAFKA_SERVER_PORT=8099" "TESTSUITE_KAFKA_CONTROLLER_PORT=8100"
         "TESTSUITE_KAFKA_CUSTOM_TOPICS=bt:4,lt-1:4,lt-2:4,tt-1:1,tt-2:1,tt-3:1,tt-4:1,tt-5:1,tt-6:1,tt-7:1,tt-8:1"
 )
 

mongo/CMakeLists.txt

@@ -13,10 +13,10 @@ userver_module(
     LINK_LIBRARIES_PRIVATE mongo::mongoc_static
     UTEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_test.cpp"
     DBTEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_mongotest.cpp"
-    DBTEST_DATABASES
-        mongo
-        # Tests that use IsCollectionWriteConcernTimeout require multi-instance mongo
-        DBTEST_ENV TESTSUITE_MONGO_RS_INSTANCE_COUNT=5 UBENCH_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_benchmark.cpp"
+    DBTEST_DATABASES mongo
+                     # Tests that use IsCollectionWriteConcernTimeout require multi-instance mongo
+    DBTEST_ENV TESTSUITE_MONGO_RS_INSTANCE_COUNT=5
+    UBENCH_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_benchmark.cpp"
 )
 
 _userver_directory_install(

mysql/CMakeLists.txt

@@ -11,7 +11,8 @@ userver_module(
                            "${CMAKE_CURRENT_SOURCE_DIR}/tests"
     UTEST_LINK_LIBRARIES libmariadb
     DBTEST_DATABASES mysql
-    UBENCH_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/benchmarks" UBENCH_LINK_LIBRARIES libmariadb
+    UBENCH_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/benchmarks"
+    UBENCH_LINK_LIBRARIES libmariadb
     UBENCH_DATABASES mysql
 )
 

postgresql/CMakeLists.txt

@@ -42,15 +42,12 @@ userver_module(
     LINK_LIBRARIES_PRIVATE userver-libpq INCLUDE_DIRS_PRIVATE "${LIBPQ_VERSION_DIR}"
     UTEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_test.cpp"
     DBTEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_pgtest.cpp"
-    DBTEST_DATABASES
-        postgresql
-        DBTEST_ENV
-        POSTGRES_TEST_DSN=postgresql://testsuite@localhost:15433/postgres
-        UBENCH_SOURCES
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/*_benchmark.cpp"
-        UBENCH_LINK_LIBRARIES
-        userver-libpq
-    UBENCH_DATABASES postgresql UBENCH_ENV POSTGRES_DSN_BENCH=postgresql://testsuite@localhost:15433/postgres
+    DBTEST_DATABASES postgresql
+    DBTEST_ENV POSTGRES_TEST_DSN=postgresql://testsuite@localhost:15433/postgres
+    UBENCH_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_benchmark.cpp"
+    UBENCH_LINK_LIBRARIES userver-libpq
+    UBENCH_DATABASES postgresql
+    UBENCH_ENV POSTGRES_DSN_BENCH=postgresql://testsuite@localhost:15433/postgres
 )
 
 target_sources(${PROJECT_NAME} PRIVATE "${LIBPQ_VERSION_DIR}/userver_libpq_version.hpp")