From b285b4e15fe58d40d29d32a64544b86c0a4569f3 Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Sun, 18 Dec 2016 16:39:16 +0300
Subject: [PATCH] testing: add TEST argument to tde_add_check_executable()
 macro

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit 7e73e618d0470110b60f8f1d3211841daf99b593)
---
 kabc/tests/CMakeLists.txt    |  3 +--
 kdecore/tests/CMakeLists.txt | 12 +++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/kabc/tests/CMakeLists.txt b/kabc/tests/CMakeLists.txt
index 1c549e88e..1f4078d62 100644
--- a/kabc/tests/CMakeLists.txt
+++ b/kabc/tests/CMakeLists.txt
@@ -37,7 +37,6 @@ link_directories(
 ##### test programs ##############################
 
 tde_add_check_executable( testlock            AUTOMOC LINK kabc-shared )
-tde_add_check_executable( testldapclient      AUTOMOC LINK kabc-shared )
 tde_add_check_executable( testkabc            AUTOMOC LINK kabc-shared )
 tde_add_check_executable( testkabcdlg         AUTOMOC LINK kabc-shared )
 tde_add_check_executable( testdistlist        AUTOMOC LINK kabc-shared )
@@ -52,4 +51,4 @@ tde_add_check_executable( bigwrite AUTOMOC LINK kabc_file-shared )
 # tde_add_check_executable( testdb   AUTOMOC LINK kabc_file-shared )
 tde_add_check_executable( kabcargl AUTOMOC LINK kabc_file-shared )
 
-add_test( kabc/testldapclient testldapclient )
+tde_add_check_executable( testldapclient      AUTOMOC LINK kabc-shared TEST)
diff --git a/kdecore/tests/CMakeLists.txt b/kdecore/tests/CMakeLists.txt
index 1ae327cc1..bc6dcabf7 100644
--- a/kdecore/tests/CMakeLists.txt
+++ b/kdecore/tests/CMakeLists.txt
@@ -32,25 +32,23 @@ tde_add_library( kconfigtest SHARED AUTOMOC
 
 set( CHECKS
   kconfigtestgui klocaletest kprocesstest ksimpleconfigtest kstddirstest
-  kurltest kuniqueapptest ktempfiletest krandomsequencetest kdebugtest
+  kuniqueapptest ktempfiletest krandomsequencetest kdebugtest
   ksocktest kstringhandlertest kcmdlineargstest kapptest kmemtest
   dcopkonqtest kipctest cplusplustest kiconloadertest kresolvertest
   kmdcodectest knotifytest ksortablevaluelisttest krfcdatetest testqtargs
   kprociotest kcharsetstest kcalendartest kmacroexpandertest kshelltest
-  kxerrorhandlertest startserviceby kstdacceltest kglobaltest ktimezonestest
+  kxerrorhandlertest startserviceby kglobaltest ktimezonestest
 )
 
-set( TESTS kurltest kstdacceltest )
 
 foreach( _check ${CHECKS} )
   tde_add_check_executable( ${_check} AUTOMOC LINK kconfigtest-shared )
 endforeach( )
 
+tde_add_check_executable( kurltest        AUTOMOC LINK kconfigtest-shared TEST )
+tde_add_check_executable( kstdacceltest AUTOMOC LINK kconfigtest-shared TEST )
+
 tde_add_check_executable( kidlservertest AUTOMOC SOURCES KIDLTest.cpp KIDLTest.skel
   LINK kconfigtest-shared )
 tde_add_check_executable( kidlclienttest AUTOMOC SOURCES KIDLTestClient.cpp
   KIDLTest.stub LINK kconfigtest-shared )
-
-foreach( _test ${TESTS})
-  add_test( kdecore/${_test} ${_test} )
-endforeach( )