summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2016-09-08 14:22:39 (GMT)
committerDaniel Vrátil <dvratil@kde.org>2016-09-08 14:22:39 (GMT)
commit4f5008d76010ff162662126357a1936b055b8ada (patch)
tree5bb803e19b38578ac383f39db4b054535480aade
parent5902de9b81aa7201efeea57e29ab60267f545fb6 (diff)
Enable MySQL and PostgreSQL tests by default
-rw-r--r--KF5AkonadiMacros.cmake9
-rw-r--r--autotests/libs/CMakeLists.txt2
2 files changed, 8 insertions, 3 deletions
diff --git a/KF5AkonadiMacros.cmake b/KF5AkonadiMacros.cmake
index ebd415a..b747c66 100644
--- a/KF5AkonadiMacros.cmake
+++ b/KF5AkonadiMacros.cmake
@@ -63,7 +63,8 @@ macro(add_akonadi_isolated_test_advanced _source _additionalsources _linklibrari
set( SQLITE_EXTRA_OPTIONS -xml -o ${TEST_RESULT_OUTPUT_PATH}/sqlite-${_name}.xml )
endif()
- if (NOT KDEPIMLIBS_RUN_MYSQL_ISOLATED_TESTS AND NOT AKONADI_RUN_MYSQL_ISOLATED_TESTS)
+ if ((NOT KDEPIMLIBS_RUN_MYSQL_ISOLATED_TESTS AND NOT AKONADI_RUN_MYSQL_ISOLATED_TESTS)
+ OR ${KDEPIMLIBS_RUN_MYSQL_ISOLATED_TESTS} OR ${AKONADI_RUN_MYSQL_ISOLATED_TESTS})
find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin )
if ( MYSQLD_EXECUTABLE )
add_test( NAME akonadi-mysql-fs-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-fs.xml ${_executable}
@@ -71,7 +72,8 @@ macro(add_akonadi_isolated_test_advanced _source _additionalsources _linklibrari
endif()
endif()
- if (NOT KDEPIMLIBS_RUN_PGSQL_ISOLATED_TESTS AND NOT AKONADI_RUN_PGSQL_ISOLATED_TESTS)
+ if ((NOT KDEPIMLIBS_RUN_PGSQL_ISOLATED_TESTS AND NOT AKONADI_RUN_PGSQL_ISOLATED_TESTS)
+ OR ${KDEPIMLIBS_RUN_PGSQL_ISOLATED_TESTS} OR ${AKONADI_RUN_PGSQL_ISOLATED_TESTS})
find_program( POSTGRES_EXECUTABLE postgres )
if ( POSTGRES_EXECUTABLE )
add_test( NAME akonadi-postgresql-fs-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-fs.xml ${_executable}
@@ -79,7 +81,8 @@ macro(add_akonadi_isolated_test_advanced _source _additionalsources _linklibrari
endif()
endif()
- if (NOT KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS AND NOT AKONADI_RUN_SQLITE_ISOLATED_TESTS)
+ if ((NOT KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS AND NOT AKONADI_RUN_SQLITE_ISOLATED_TESTS)
+ OR ${KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS} OR ${AKONADI_RUN_SQLITE_ISOLATED_TESTS})
add_test( NAME akonadi-sqlite-${_name} COMMAND ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-sqlite-db.xml ${_executable}
${SQLITE_EXTRA_OPTIONS} )
endif()
diff --git a/autotests/libs/CMakeLists.txt b/autotests/libs/CMakeLists.txt
index a3814fd..6282ac8 100644
--- a/autotests/libs/CMakeLists.txt
+++ b/autotests/libs/CMakeLists.txt
@@ -14,6 +14,8 @@ file(MAKE_DIRECTORY ${TEST_RESULT_OUTPUT_PATH})
option(AKONADI_TESTS_XML "Use XML files for the test results, instead of plain text." FALSE)
option(AKONADI_RUN_SQLITE_ISOLATED_TESTS "Run isolated tests with sqlite3 as backend" TRUE)
+option(AKONADI_RUN_MYSQL_ISOLATED_TESTS "Run isolated tests with MySQL as backend" TRUE)
+option(AKONADI_RUN_PGSQL_ISOLATED_TESTS "Run isolated tests with PostgreSQL as backend" TRUE)
kde_enable_exceptions()