aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-28 21:42:05 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-28 21:42:05 -0600
commit9045a274a93bb96be458e563bebbceca1426da96 (patch)
treee82bf2bfc2d8ba3090fd12f501f40300379e47da
parent81d4a2586eb9ff910b6df45569ad8574573a60eb (diff)
downloadayatana-indicator-datetime-9045a274a93bb96be458e563bebbceca1426da96.tar.gz
ayatana-indicator-datetime-9045a274a93bb96be458e563bebbceca1426da96.tar.bz2
ayatana-indicator-datetime-9045a274a93bb96be458e563bebbceca1426da96.zip
comment out unit tests that require a version of dbus-test-runner that hasn't landed yet.
-rw-r--r--tests/CMakeLists.txt21
1 files changed, 12 insertions, 9 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c86b4bb..3dcd151 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -53,12 +53,15 @@ add_test_by_name(test-timezone-file)
add_test_by_name(test-utils)
-function(add_dbusmock_test_by_name name)
- set (TEST_NAME ${name})
- add_executable (${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled)
- add_test (${TEST_NAME} ${TEST_NAME})
- add_dependencies (${TEST_NAME} libindicatordatetimeservice)
- target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${SERVICE_DEPS_LIBRARIES} ${DBUSTEST_LIBRARIES} ${GTEST_LIBS})
-endfunction()
-add_dbusmock_test_by_name(test-timezone-geoclue)
-add_dbusmock_test_by_name(test-timezones)
+# disabling the timezone unit tests because they require
+# https://code.launchpad.net/~ted/dbus-test-runner/multi-interface-test/+merge/199724
+# which hasn't landed yet. These can be re-enabled as soon as that lands.
+#function(add_dbusmock_test_by_name name)
+# set (TEST_NAME ${name})
+# add_executable (${TEST_NAME} ${TEST_NAME}.cpp gschemas.compiled)
+# add_test (${TEST_NAME} ${TEST_NAME})
+# add_dependencies (${TEST_NAME} libindicatordatetimeservice)
+# target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${SERVICE_DEPS_LIBRARIES} ${DBUSTEST_LIBRARIES} ${GTEST_LIBS})
+#endfunction()
+#add_dbusmock_test_by_name(test-timezone-geoclue)
+#add_dbusmock_test_by_name(test-timezones)