← Back to branch summary

~ubuntu-branches/ubuntu/quantal/akonadi/quantal

« back to all changes in this revision

Viewing changes to debian/patches/disable_dbus_requiring_tests.diff

  • Committer: Package Import Robot
  • Author(s): Jonathan Thomas
  • Date: 2012-05-24 19:27:56 UTC
  • mfrom: (3.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120524192756-yhdijq0ny2jy912h
Tags: 1.7.2-1ubuntu1
* Merge with Debian, remaining changes:
  - Add a mysqld-akonadi wrapper script.
  - Add apparmor profile for mysqld-akonadi (usr.sbin.mysqld-akonadi).
  - Make akonadi-backend-mysql depend on mysql-server-core-5.5 and
    mysql-client-core-5.5 instead of mysql-server-core.
  - Force dependency on akonadi-backend-mysql for akonadi-server.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/disable_dbus_requiring_tests.diff
 
1
From: Modestas Vainius <modax@debian.org>
 
2
Subject: Disable tests which require active DBus
 
3
Origin: vendor
 
4
Forwarded: not-needed
 
5
Last-Update: 2012-05-12
 
6
 
 
7
The following tests need active DBus daemon at the moment. Disable them.
 
8
 
 
9
- akonadi-imapstreamparsertest
 
10
- akonadi-akdbustest
 
11
- akonadi-akstandarddirstest
 
12
- akonadi-handlertest
 
13
- akonadi-dbconfigtest
 
14
 
 
15
--- a/server/tests/unittest/CMakeLists.txt
 
16
+++ b/server/tests/unittest/CMakeLists.txt
 
17
@@ -18,13 +18,13 @@ macro(add_server_test _source _libs)
 
18
   endif (AKONADI_STATIC_SQLITE)
 
19
 endmacro(add_server_test)
 
20
 
 
21
-add_server_test(imapstreamparsertest.cpp akonadiprivate)
 
22
+#add_server_test(imapstreamparsertest.cpp akonadiprivate)
 
23
 add_server_test(scopetest.cpp akonadiprivate)
 
24
 add_server_test(handlerhelpertest.cpp akonadiprivate)
 
25
 add_server_test(querybuildertest.cpp akonadiprivate)
 
26
 add_server_test(dbinitializertest.cpp akonadiprivate)
 
27
 add_server_test(dbupdatertest.cpp akonadiprivate)
 
28
-add_server_test(akdbustest.cpp akonadiprivate)
 
29
-add_server_test(akstandarddirstest.cpp akonadiprivate)
 
30
-add_server_test(handlertest.cpp akonadiprivate)
 
31
-add_server_test(dbconfigtest.cpp akonadiprivate)
 
32
+#add_server_test(akdbustest.cpp akonadiprivate)
 
33
+#add_server_test(akstandarddirstest.cpp akonadiprivate)
 
34
+#add_server_test(handlertest.cpp akonadiprivate)
 
35
+#add_server_test(dbconfigtest.cpp akonadiprivate)