[Kde-pim] [kdepimlibs/KDE/4.10] akonadi: Disable the unittests that create a self-contained akonadi.

[David Faure]

Git commit 9a5d643ee8b761ca8b7fd5b34175e9721e59380e by David Faure.
Committed on 04/03/2013 at 18:56.
Pushed by dfaure into branch 'KDE/4.10'.

Disable the unittests that create a self-contained akonadi.

They take forever to run, and they leave junk behind on failure.
Add option to enable these tests locally -- for Volker to fix them :-)
CCMAIL: kde-pim at kde.org

Ben: please re-enable the running of kdepimlibs tests on build.kde.org
CCMAIL: bcooksley at kde.org

M  +3    -1    akonadi/kmime/tests/CMakeLists.txt
M  +20   -17   akonadi/tests/CMakeLists.txt

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

diff --git a/akonadi/kmime/tests/CMakeLists.txt b/akonadi/kmime/tests/CMakeLists.txt
index d08e396..b03511d 100644
--- a/akonadi/kmime/tests/CMakeLists.txt
+++ b/akonadi/kmime/tests/CMakeLists.txt
@@ -49,7 +49,9 @@ macro(add_akonadi_isolated_test _source)
 
   find_program(_testrunner akonaditest)
 
-  add_test( akonadikmime-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config.xml ${_executable} )
+  if (KDEPIMLIBS_RUN_ISOLATED_TESTS)
+    add_test( akonadikmime-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config.xml ${_executable} )
+  endif()
 endmacro(add_akonadi_isolated_test)
 
 
diff --git a/akonadi/tests/CMakeLists.txt b/akonadi/tests/CMakeLists.txt
index c8cb014..d599368 100644
--- a/akonadi/tests/CMakeLists.txt
+++ b/akonadi/tests/CMakeLists.txt
@@ -7,6 +7,7 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 set( TEST_RESULT_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/testresults )
 file(MAKE_DIRECTORY ${TEST_RESULT_OUTPUT_PATH})
 
+option(KDEPIMLIBS_RUN_ISOLATED_TESTS "Run the isolated tests." FALSE)
 option(KDEPIMLIBS_TESTS_XML "Use XML files for the test results, instead of plain text." FALSE)
 option(KDEPIMLIBS_TESTS_SQLITE "Run all isolated tests with sqlite3 as backend in addition to the default backends" FALSE)
 
@@ -80,25 +81,27 @@ macro(add_akonadi_isolated_test _source)
     set( SQLITE_EXTRA_OPTIONS -xml -o ${TEST_RESULT_OUTPUT_PATH}/sqlite-${_name}.xml )
   endif()
 
-  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( akonadi-mysql-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-db.xml ${_executable}
-      ${MYSQL_EXTRA_OPTIONS_DB} )
-    add_test( akonadi-mysql-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-fs.xml ${_executable}
-      ${MYSQL_EXTRA_OPTIONS_FS} )
-  endif()
+  if ( KDEPIMLIBS_RUN_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( akonadi-mysql-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-db.xml ${_executable}
+        ${MYSQL_EXTRA_OPTIONS_DB} )
+      add_test( akonadi-mysql-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-fs.xml ${_executable}
+        ${MYSQL_EXTRA_OPTIONS_FS} )
+    endif()
 
-  find_program( POSTGRES_EXECUTABLE postgres )
-  if ( POSTGRES_EXECUTABLE )
-    add_test( akonadi-postgresql-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-db.xml ${_executable}
-      ${POSTGRESL_EXTRA_OPTIONS_DB} )
-    add_test( akonadi-postgresql-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-fs.xml ${_executable}
-      ${POSTGRESL_EXTRA_OPTIONS_FS} )
-  endif()
+    find_program( POSTGRES_EXECUTABLE postgres )
+    if ( POSTGRES_EXECUTABLE )
+      add_test( akonadi-postgresql-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-db.xml ${_executable}
+        ${POSTGRESL_EXTRA_OPTIONS_DB} )
+      add_test( akonadi-postgresql-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-fs.xml ${_executable}
+        ${POSTGRESL_EXTRA_OPTIONS_FS} )
+    endif()
 
-  if ( KDEPIMLIBS_TESTS_SQLITE )
-    add_test( akonadi-sqlite-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-sqlite-db.xml ${_executable}
-      ${SQLITE_EXTRA_OPTIONS} )
+    if ( KDEPIMLIBS_TESTS_SQLITE )
+      add_test( akonadi-sqlite-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-sqlite-db.xml ${_executable}
+        ${SQLITE_EXTRA_OPTIONS} )
+    endif()
   endif()
 endmacro(add_akonadi_isolated_test)
 

_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/