[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dferry] tests: Clean up CMake code in tests/
From:       Andreas Hartmetz <ahartmetz () gmail ! com>
Date:       2016-10-12 0:57:08
Message-ID: E1bu7r2-0007PZ-1m () code ! kde ! org
[Download RAW message or body]

Git commit 40ca935cabf295f02df5e0e79061e0cd117cf092 by Andreas Hartmetz.
Committed on 11/10/2016 at 22:08.
Pushed by ahartmetz into branch 'master'.

Clean up CMake code in tests/

M  +7    -11   tests/buslogic/CMakeLists.txt
M  +7    -11   tests/client/CMakeLists.txt
M  +7    -11   tests/events/CMakeLists.txt
M  +5    -9    tests/serialization/CMakeLists.txt

http://commits.kde.org/dferry/40ca935cabf295f02df5e0e79061e0cd117cf092

diff --git a/tests/buslogic/CMakeLists.txt b/tests/buslogic/CMakeLists.txt
index 1c8f088..980b033 100644
--- a/tests/buslogic/CMakeLists.txt
+++ b/tests/buslogic/CMakeLists.txt
@@ -1,14 +1,10 @@
-MACRO(BUSLOGICTESTS)
-    FOREACH(_testname ${ARGN})
-        add_executable(tst_${_testname} tst_${_testname}.cpp)
-        set_target_properties(tst_${_testname} PROPERTIES COMPILE_FLAGS
-                              -DTEST_DATADIR="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
-        target_link_libraries(tst_${_testname} testutil dfer)
-        add_test(buslogic/${_testname} tst_${_testname})
-    ENDFOREACH(_testname)
-ENDMACRO(BUSLOGICTESTS)
-
-BUSLOGICTESTS(pendingreply threads)
+foreach(_testname pendingreply threads)
+    add_executable(tst_${_testname} tst_${_testname}.cpp)
+    set_target_properties(tst_${_testname}
+                          PROPERTIES COMPILE_FLAGS -DTEST_DATADIR="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
+    target_link_libraries(tst_${_testname} testutil dfer)
+    add_test(buslogic/${_testname} tst_${_testname})
+endforeach()
 
 if (UNIX)
     target_link_libraries(tst_threads pthread)
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 6e5b33c..dc6778d 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -1,11 +1,7 @@
-MACRO(CLIENTTESTS)
-    FOREACH(_testname ${ARGN})
-        add_executable(tst_${_testname} tst_${_testname}.cpp)
-        set_target_properties(tst_${_testname} PROPERTIES COMPILE_FLAGS
-                              -DTEST_DATADIR="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
-        target_link_libraries(tst_${_testname} testutil dferclient ${LIBTINYXML2_LIBRARIES})
-        add_test(client/${_testname} tst_${_testname})
-    ENDFOREACH(_testname)
-ENDMACRO(CLIENTTESTS)
-
-CLIENTTESTS(introspection)
+foreach(_testname introspection)
+    add_executable(tst_${_testname} tst_${_testname}.cpp)
+    set_target_properties(tst_${_testname} PROPERTIES COMPILE_FLAGS
+                            -DTEST_DATADIR="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
+    target_link_libraries(tst_${_testname} testutil dferclient ${LIBTINYXML2_LIBRARIES})
+    add_test(client/${_testname} tst_${_testname})
+endforeach()
diff --git a/tests/events/CMakeLists.txt b/tests/events/CMakeLists.txt
index 0b60e33..d8cb44c 100644
--- a/tests/events/CMakeLists.txt
+++ b/tests/events/CMakeLists.txt
@@ -1,11 +1,7 @@
-MACRO(EVENTTESTS)
-    FOREACH(_testname ${ARGN})
-        add_executable(tst_${_testname} tst_${_testname}.cpp)
-        set_target_properties(tst_${_testname} PROPERTIES COMPILE_FLAGS
-                              -DTEST_DATADIR="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
-        target_link_libraries(tst_${_testname} testutil dfer)
-        add_test(events/${_testname} tst_${_testname})
-    ENDFOREACH(_testname)
-ENDMACRO(EVENTTESTS)
-
-EVENTTESTS(timer)
+foreach(_testname timer)
+    add_executable(tst_${_testname} tst_${_testname}.cpp)
+    set_target_properties(tst_${_testname}
+                          PROPERTIES COMPILE_FLAGS -DTEST_DATADIR="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
+    target_link_libraries(tst_${_testname} testutil dfer)
+    add_test(events/${_testname} tst_${_testname})
+endforeach()
diff --git a/tests/serialization/CMakeLists.txt b/tests/serialization/CMakeLists.txt
index e03f0ee..599dd7a 100644
--- a/tests/serialization/CMakeLists.txt
+++ b/tests/serialization/CMakeLists.txt
@@ -1,9 +1,5 @@
-MACRO(SERIALIZATIONTESTS)
-    FOREACH(_testname ${ARGN})
-        add_executable(tst_${_testname} tst_${_testname}.cpp)
-        target_link_libraries(tst_${_testname} testutil dfer)
-        add_test(serialization/${_testname} tst_${_testname})
-    ENDFOREACH(_testname)
-ENDMACRO(SERIALIZATIONTESTS)
-
-SERIALIZATIONTESTS(arguments arguments_slow message)
+foreach(_testname arguments arguments_slow message)
+    add_executable(tst_${_testname} tst_${_testname}.cpp)
+    target_link_libraries(tst_${_testname} testutil dfer)
+    add_test(serialization/${_testname} tst_${_testname})
+endforeach()

[prev in list] [next in list] [prev in thread] [next in thread]