Style: Fix formatting of add_msr_test_plugin

ElektraInitiative · Nov 24, 2019 · 5968b5e · 5968b5e
1 parent 7cc55bc
commit 5968b5e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/.cmake-format.yaml b/.cmake-format.yaml
@@ -66,6 +66,12 @@ additional_commands:
       REQUIRED_PLUGINS: +
       REQUIRED_TOOLS: +
 
+  add_msr_test_plugin:
+    kwargs:
+      ENVIRONMENT: +
+      REQUIRED_PLUGINS: +
+      REQUIRED_TOOLS: +
+
   download_project:
     kwargs:
       PROJ: 1

diff --git a/scripts/cmake/Modules/LibAddPlugin.cmake b/scripts/cmake/Modules/LibAddPlugin.cmake
@@ -460,8 +460,10 @@ function (add_plugin PLUGIN_SHORT_NAME)
 		endif ()
 
 		if (ARG_TEST_README AND ENABLE_KDB_TESTING)
-			add_msr_test_plugin (${PLUGIN_SHORT_NAME} ENVIRONMENT ${ARG_TEST_ENVIRONMENT} REQUIRED_PLUGINS
-					     ${ARG_TEST_REQUIRED_PLUGINS})
+			add_msr_test_plugin (
+				${PLUGIN_SHORT_NAME}
+				ENVIRONMENT ${ARG_TEST_ENVIRONMENT}
+				REQUIRED_PLUGINS ${ARG_TEST_REQUIRED_PLUGINS})
 		endif (ARG_TEST_README AND ENABLE_KDB_TESTING)
 
 		return ()

diff --git a/tests/shell/shell_recorder/tutorial_wrapper/CMakeLists.txt b/tests/shell/shell_recorder/tutorial_wrapper/CMakeLists.txt
@@ -24,19 +24,21 @@ endif (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
 
 add_msr_test (tutorial_arrays "${CMAKE_SOURCE_DIR}/doc/tutorials/arrays.md")
 add_msr_test (tutorial_cascading "${CMAKE_SOURCE_DIR}/doc/tutorials/cascading.md")
-add_msr_test (tutorial_install_config "${CMAKE_SOURCE_DIR}/doc/tutorials/install-config-files.md"
-	      REQUIRED_PLUGINS ini resolver
-	      ENVIRONMENT KDB_EXEC_PATH=${CMAKE_SOURCE_DIR}/scripts/kdb)
+add_msr_test (
+	tutorial_install_config "${CMAKE_SOURCE_DIR}/doc/tutorials/install-config-files.md"
+	REQUIRED_PLUGINS ini resolver
+	ENVIRONMENT KDB_EXEC_PATH=${CMAKE_SOURCE_DIR}/scripts/kdb)
 add_msr_test (tutorial_storage_plugins "${CMAKE_SOURCE_DIR}/doc/tutorials/storage-plugins.md" REQUIRED_PLUGINS type yamlcpp)
 add_msr_test (cmerge "${CMAKE_SOURCE_DIR}/doc/tutorials/cmerge.md" REQUIRED_PLUGINS hosts line PROPERTY LABELS memleak)
 
 if (ENABLE_ASAN)
 	message (STATUS "Excluding Markdown Shell Recorder test for `validation`, as it leaks memory and fails with ASAN enabled")
 else (ENABLE_ASAN)
 	add_msr_test (tutorial_validation "${CMAKE_SOURCE_DIR}/doc/tutorials/validation.md" REQUIRED_PLUGINS ni validation)
-	add_msr_test (tutorial_crypto "${CMAKE_SOURCE_DIR}/doc/tutorials/crypto.md"
-		      REQUIRED_PLUGINS crypto_gcrypt fcrypt
-		      REQUIRED_TOOLS gen-gpg-testkey)
+	add_msr_test (
+		tutorial_crypto "${CMAKE_SOURCE_DIR}/doc/tutorials/crypto.md"
+		REQUIRED_PLUGINS crypto_gcrypt fcrypt
+		REQUIRED_TOOLS gen-gpg-testkey)
 endif (ENABLE_ASAN)
 
 # ========