From 70b13693478b296b8a3cd1654baa8013434358c5 Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@kde.org>
Date: Sat, 16 May 2015 14:06:34 +0100
Subject: Revert "Add PROPERTIES argument to ecm_add_test and ecm_add_tests."

This reverts commit 0c224194ea7f12eaed32af746fc9138537f1919c.

Stephen Kelly pointed out that this is probably not the best approach to
the problem, and runs counter to the direction KDE's CMake code has been
going (splitting functions up and using CMake built-ins where possible).

I have a better solution in mind, which I'll post a review for later.

CCMAIL: kde-buildsystem@kde.org
CCBUG: 345797
---
 tests/ECMAddTests/single_tests/CMakeLists.txt | 39 ++++++---------------------
 tests/ECMAddTests/single_tests/test7.cpp      |  8 ------
 2 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 tests/ECMAddTests/single_tests/test7.cpp

(limited to 'tests/ECMAddTests/single_tests')

diff --git a/tests/ECMAddTests/single_tests/CMakeLists.txt b/tests/ECMAddTests/single_tests/CMakeLists.txt
index de1ae6f6..6af3857b 100644
--- a/tests/ECMAddTests/single_tests/CMakeLists.txt
+++ b/tests/ECMAddTests/single_tests/CMakeLists.txt
@@ -19,12 +19,13 @@ file(REMOVE
     "${CMAKE_CURRENT_BINARY_DIR}/test4.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test5.txt"
     "${CMAKE_CURRENT_BINARY_DIR}/test6.txt"
-    "${CMAKE_CURRENT_BINARY_DIR}/test7.txt"
     )
 
 ecm_add_test(test1.cpp
     LINK_LIBRARIES testhelper
     )
+# check target exists
+get_property(_dummy TARGET test1 PROPERTY TYPE)
 # check test exists
 get_property(_dummy TEST test1 PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET test1 PROPERTY WIN32_EXECUTABLE)
@@ -41,6 +42,7 @@ ecm_add_test(test2.cpp
     LINK_LIBRARIES testhelper
     TEST_NAME named_test
     )
+get_property(_dummy TARGET named_test PROPERTY TYPE)
 get_property(_dummy TEST named_test PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET named_test PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
@@ -56,6 +58,7 @@ ecm_add_test(test3.cpp
     LINK_LIBRARIES testhelper
     NAME_PREFIX prefix_
     )
+get_property(_dummy TARGET test3 PROPERTY TYPE)
 get_property(_dummy TEST prefix_test3 PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET test3 PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
@@ -71,6 +74,7 @@ ecm_add_test(test4.cpp
     LINK_LIBRARIES testhelper
     GUI
     )
+get_property(_dummy TARGET test4 PROPERTY TYPE)
 get_property(_dummy TEST test4 PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET test4 PROPERTY WIN32_EXECUTABLE)
 if (NOT _is_win32)
@@ -87,10 +91,9 @@ ecm_add_test(test5.cpp
     TEST_NAME combined_test
     NAME_PREFIX another_prefix_
     GUI
-    PROPERTIES
-        LABELS "lab"
-        RUN_SERIAL TRUE
     )
+get_property(_dummy TARGET combined_test PROPERTY TYPE)
+get_property(_dummy TEST another_prefix_combined_test PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET combined_test PROPERTY WIN32_EXECUTABLE)
 if (NOT _is_win32)
     message(FATAL_ERROR "combined_test is not a WIN32 executable when it should be")
@@ -99,20 +102,13 @@ get_property(_is_bundle TARGET combined_test PROPERTY MACOSX_BUNDLE)
 if (NOT _is_bundle)
     message(FATAL_ERROR "combined_test is not an OS/X bundle when it should be")
 endif()
-get_property(_labels TEST another_prefix_combined_test PROPERTY LABELS)
-if (NOT _labels STREQUAL "lab")
-    message(FATAL_ERROR "another_prefix_combined_test LABELS property was \"${_labels}\", expected \"lab\"")
-endif()
-get_property(_run_serial TEST another_prefix_combined_test PROPERTY RUN_SERIAL)
-if (NOT _run_serial)
-    message(FATAL_ERROR "another_prefix_combined_test LABELS property was \"${_run_serial}\", expected TRUE")
-endif()
 
 
 ecm_add_test(test6.cpp test6body.cpp
     LINK_LIBRARIES testhelper
     TEST_NAME multifile_test
     )
+get_property(_dummy TARGET multifile_test PROPERTY TYPE)
 get_property(_dummy TEST multifile_test PROPERTY TIMEOUT)
 get_property(_is_win32 TARGET multifile_test PROPERTY WIN32_EXECUTABLE)
 if (_is_win32)
@@ -124,22 +120,3 @@ if (_is_bundle)
 endif()
 
 
-ecm_add_test(test7.cpp
-    LINK_LIBRARIES testhelper
-    PROPERTIES
-        LABELS "somelabel"
-    )
-get_property(_dummy TEST test7 PROPERTY TIMEOUT)
-get_property(_is_win32 TARGET test7 PROPERTY WIN32_EXECUTABLE)
-if (_is_win32)
-    message(FATAL_ERROR "test7 is a WIN32 executable when it should not be")
-endif()
-get_property(_is_bundle TARGET test7 PROPERTY MACOSX_BUNDLE)
-if (_is_bundle)
-    message(FATAL_ERROR "test7 is an OS/X bundle when it should not be")
-endif()
-get_property(_labels TEST test7 PROPERTY LABELS)
-if (NOT _labels STREQUAL "somelabel")
-    message(FATAL_ERROR "test7 LABELS property was \"${_labels}\", expected \"somelabel\"")
-endif()
-
diff --git a/tests/ECMAddTests/single_tests/test7.cpp b/tests/ECMAddTests/single_tests/test7.cpp
deleted file mode 100644
index 069859e7..00000000
--- a/tests/ECMAddTests/single_tests/test7.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "testhelper.h"
-
-int main()
-{
-    make_test_file("test7.txt");
-    return 0;
-}
-
-- 
cgit v1.2.1