aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Richardson <arichardson.kde@gmail.com>2014-05-10 15:53:00 +0200
committerAlex Richardson <arichardson.kde@gmail.com>2014-05-10 15:53:00 +0200
commit08c778f7cbc4aa76c2aff51bec57aceab44b3ae3 (patch)
treec5cfab556664da6eb94f8f9db072b1cd113850f7
parent88c9a9664e99b639df4cde2be22dbe44df228879 (diff)
downloadkconfig-08c778f7cbc4aa76c2aff51bec57aceab44b3ae3.tar.gz
kconfig-08c778f7cbc4aa76c2aff51bec57aceab44b3ae3.tar.bz2
Revert "adapt to ECMAddTests change"
This reverts commit 88c9a9664e99b639df4cde2be22dbe44df228879.
-rw-r--r--autotests/CMakeLists.txt8
-rw-r--r--autotests/kconfig_compiler/CMakeLists.txt4
2 files changed, 6 insertions, 6 deletions
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 11d98f18..02885e71 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -26,22 +26,22 @@ ecm_add_tests(
LINK_LIBRARIES KF5::ConfigCore Qt5::Test Qt5::Concurrent
)
-target_include_directories(test_kconf_update PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../src/kconf_update)
+target_include_directories(kconfigcore-test_kconf_update PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../src/kconf_update)
# compile KEntryMap into the test since it's not exported
set(kentrymaptest_SRCS kentrymaptest.cpp ../src/core/kconfigdata.cpp)
ecm_add_test(${kentrymaptest_SRCS}
- TEST_NAME kentrymaptest NAME_PREFIX "kconfigcore-"
+ TEST_NAME kconfigcore-kentrymaptest
LINK_LIBRARIES KF5::ConfigCore Qt5::Test
)
# compile KConfigUtils into the test since it's not exported
set(test_kconfigutils_SRCS test_kconfigutils ../src/kconf_update/kconfigutils.cpp)
ecm_add_test(${test_kconfigutils_SRCS}
- TEST_NAME test_kconfigutils NAME_PREFIX "kconfigcore-"
+ TEST_NAME kconfigcore-test_kconfigutils
LINK_LIBRARIES KF5::ConfigCore Qt5::Test
)
-target_include_directories(test_kconfigutils PRIVATE ../src/kconf_update)
+target_include_directories(kconfigcore-test_kconfigutils PRIVATE ../src/kconf_update)
ecm_add_tests(
kconfigguitest.cpp
diff --git a/autotests/kconfig_compiler/CMakeLists.txt b/autotests/kconfig_compiler/CMakeLists.txt
index 2e9b1c46..73e89bd2 100644
--- a/autotests/kconfig_compiler/CMakeLists.txt
+++ b/autotests/kconfig_compiler/CMakeLists.txt
@@ -218,14 +218,14 @@ gen_kcfg_test_source(signals_test_singleton_dpointer kconfigcompiler_test_signal
gen_kcfg_test_source(signals_test_no_singleton_dpointer kconfigcompiler_test_signals_SRCS KCFG signals_test.kcfg)
ecm_add_test(${kconfigcompiler_test_signals_SRCS}
- TEST_NAME signals-test NAME_PREFIX "kconfigcompiler-"
+ TEST_NAME kconfigcompiler-signals-test
LINK_LIBRARIES Qt5::Test KF5::ConfigGui
)
########### next target ###############
ecm_add_test(kconfigcompiler_test.cpp
- TEST_NAME basic-test NAME_PREFIX "kconfigcompiler-"
+ TEST_NAME kconfigcompiler-basic-test
LINK_LIBRARIES Qt5::Test
)