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

List:       kde-commits
Subject:    [kdepimlibs/frameworks] kholidays: Build tests.
From:       Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date:       2014-03-31 19:03:59
Message-ID: E1WUhV1-0002je-Ud () scm ! kde ! org
[Download RAW message or body]

Git commit 9df54e6fcb7f7808997c172b0fa2f69dea73d601 by Christophe Giboudeaux.
Committed on 31/03/2014 at 19:05.
Pushed by cgiboudeaux into branch 'frameworks'.

Build tests.

M  +1    -1    kholidays/CMakeLists.txt
M  +23   -43   kholidays/autotests/CMakeLists.txt
M  +1    -1    kholidays/autotests/testseasons.cpp
M  +1    -1    kholidays/autotests/testsunriseset.cpp
M  +2    -2    kholidays/autotests/testzodiac.cpp

http://commits.kde.org/kdepimlibs/9df54e6fcb7f7808997c172b0fa2f69dea73d601

diff --git a/kholidays/CMakeLists.txt b/kholidays/CMakeLists.txt
index 4f04d86..905798f 100644
--- a/kholidays/CMakeLists.txt
+++ b/kholidays/CMakeLists.txt
@@ -31,7 +31,7 @@ find_package(KF5 ${KF5_VERSION} CONFIG REQUIRED COMPONENTS \
ItemViews KDE4Support  
 ########### Targets ###########
 add_subdirectory(src)
-#add_subdirectory(autotests)
+add_subdirectory(autotests)
 add_subdirectory(holidays)
 
 ########### CMake Config Files ###########
diff --git a/kholidays/autotests/CMakeLists.txt b/kholidays/autotests/CMakeLists.txt
index 2fd3dee..57ea36d 100644
--- a/kholidays/autotests/CMakeLists.txt
+++ b/kholidays/autotests/CMakeLists.txt
@@ -1,70 +1,50 @@
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+include(ECMMarkAsTest)
 
-include_directories(
-  ${CMAKE_SOURCE_DIR}/kholidays
-  ${CMAKE_BINARY_DIR}/kholidays
-)
+find_package(Qt5Test CONFIG REQUIRED)
 
 ########### next target ###############
 
 set(testlunar_SRCS testlunar.cpp)
 
-kde4_add_unit_test(testlunar TESTNAME kholidays-testlunar ${testlunar_SRCS})
-
-target_link_libraries(testlunar
-  kholidays
-  ${KDE4_KDECORE_LIBS}
-  ${QT_QTGUI_LIBRARY}
-  ${QT_QTTEST_LIBRARY}
-)
+add_executable(testlunar ${testlunar_SRCS})
+add_test(testlunar testlunar)
+ecm_mark_as_test(testlunar)
+target_link_libraries(testlunar KF5Holidays Qt5::Test)
 
 ########### next target ###############
 
 set(testseasons_SRCS testseasons.cpp)
 
-kde4_add_unit_test(testseasons TESTNAME kholidays-testseasons ${testseasons_SRCS})
-
-target_link_libraries(testseasons
-  kholidays
-  ${KDE4_KDECORE_LIBS}
-  ${QT_QTGUI_LIBRARY}
-  ${QT_QTTEST_LIBRARY}
-)
+add_executable(testseasons ${testseasons_SRCS})
+add_test(testseasons testseasons)
+ecm_mark_as_test(testseasons)
+target_link_libraries(testseasons KF5Holidays Qt5::Test)
 
 ########### next target ###############
 
 set(testsunriseset_SRCS testsunriseset.cpp)
 
-kde4_add_unit_test(testsunriseset TESTNAME kholidays-testsunriseset \
                ${testsunriseset_SRCS})
-
-target_link_libraries(testsunriseset
-  kholidays
-  ${KDE4_KDECORE_LIBS}
-  ${QT_QTGUI_LIBRARY}
-  ${QT_QTTEST_LIBRARY}
-)
+add_executable(testsunriseset ${testsunriseset_SRCS})
+add_test(testsunriseset testsunriseset)
+ecm_mark_as_test(testsunriseset)
+target_link_libraries(testsunriseset KF5Holidays Qt5::Test)
 
 ########### next target ###############
 
 set(testzodiac_SRCS testzodiac.cpp)
 
-kde4_add_unit_test(testzodiac TESTNAME kholidays-testzodiac ${testzodiac_SRCS})
-
-target_link_libraries(testzodiac
-  kholidays
-  ${KDE4_KDECORE_LIBS}
-  ${QT_QTTEST_LIBRARY}
-)
+add_executable(testzodiac ${testzodiac_SRCS})
+add_test(testzodiac testzodiac)
+ecm_mark_as_test(testzodiac)
+target_link_libraries(testzodiac KF5Holidays Qt5::Test)
 
 ########### next target ###############
 
 set(testholidayregion_SRCS testholidayregion.cpp)
 
-kde4_add_unit_test(testholidayregion TESTNAME kholidays-testholidayregion \
${testholidayregion_SRCS}) +add_executable(testholidayregion \
${testholidayregion_SRCS}) +add_test(testholidayregion testholidayregion)
+set_target_properties(testholidayregion PROPERTIES COMPILE_FLAGS \
-DKDESRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/\\"")  
-target_link_libraries(testholidayregion
-  kholidays
-  ${KDE4_KDECORE_LIBS}
-  ${QT_QTGUI_LIBRARY}
-  ${QT_QTTEST_LIBRARY}
-)
+ecm_mark_as_test(testholidayregion)
+target_link_libraries(testholidayregion KF5Holidays Qt5::Test)
diff --git a/kholidays/autotests/testseasons.cpp \
b/kholidays/autotests/testseasons.cpp index b08d916..e9ad475 100644
--- a/kholidays/autotests/testseasons.cpp
+++ b/kholidays/autotests/testseasons.cpp
@@ -25,7 +25,7 @@
 
 QTEST_KDEMAIN( SeasonsTest, NoGUI )
 
-#include "kholidays/astroseasons.h"
+#include "astroseasons.h"
 using namespace KHolidays;
 
 void SeasonsTest::test2005()
diff --git a/kholidays/autotests/testsunriseset.cpp \
b/kholidays/autotests/testsunriseset.cpp index 3cc1db3..9f3186e 100644
--- a/kholidays/autotests/testsunriseset.cpp
+++ b/kholidays/autotests/testsunriseset.cpp
@@ -24,7 +24,7 @@
 
 QTEST_KDEMAIN( SunriseTest, NoGUI )
 
-#include "kholidays/sunriseset.h"
+#include "sunriseset.h"
 using namespace KHolidays;
 using namespace SunRiseSet;
 
diff --git a/kholidays/autotests/testzodiac.cpp b/kholidays/autotests/testzodiac.cpp
index 2c323c8..812beb1 100644
--- a/kholidays/autotests/testzodiac.cpp
+++ b/kholidays/autotests/testzodiac.cpp
@@ -21,7 +21,7 @@
 
 #include "zodiac.h"
 
-#include <kaboutdata.h>
+#include <k4aboutdata.h>
 #include <kdebug.h>
 #include <klocalizedstring.h>
 #include <kcmdlineargs.h>
@@ -40,7 +40,7 @@ int main( int argc, char **argv )
 
   KCmdLineOptions options;
   options.add( "verbose", ki18n( "Verbose output" ) );
-  KAboutData aboutData( "testzodiac", 0, ki18n( "Test Zodiac Calendar" ), "0.1" );
+  K4AboutData aboutData( "testzodiac", 0, ki18n( "Test Zodiac Calendar" ), "0.1" );
   QCoreApplication app( argc, argv );
 
   Zodiac::ZodiacSigns sign;


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