Skip to content
Commit 3f7a1f71 authored by Volker Krause's avatar Volker Krause
Browse files

SVN_MERGE

Merged revisions 1066340,1066674-1066675,1066697,1066700,1066754-1066756,1066768,1067023 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs

........
  r1066340 | tilladam | 2009-12-26 20:06:39 +0100 (Sat, 26 Dec 2009) | 7 lines
  
  Don't hang when the unit test framework fails to start up the server.
  
  If starting the akonadi server fails, for example due to an inability to
  launch mysql, the testrunner would never finish, since it wasn't
  monitoring the child processes exiting prematurely. Treat any external
  termination of the akonadi server process as an error, and return a
  non-zero exit code, such that the wrapping unit test fails.
........
  r1066674 | tilladam | 2009-12-27 18:40:16 +0100 (Sun, 27 Dec 2009) | 5 lines
  
  Towards making the unit test runner work on OSX.
  
  Work around a mysql limitation related to maximally allowed socket path
  length which is triggered on OSX. Allows the unit test framework to work
  there.
........
  r1066675 | tilladam | 2009-12-27 18:40:27 +0100 (Sun, 27 Dec 2009) | 10 lines
  
  Allow testrunner to work on OSX.
  
  Don't hardcode the path to dbus-launch. Write a minimal dbus session
  config file and use it. This is necessary since the normal session
  config file on OSX points to launchd, for the transport info, but for
  our internal purposes we want to explicitely use a socket based unix:
  transport, with a socket in the temporary directory we are working in,
  such that it is cleaned up properly. The testrunner now brings up the
  infrastructure (dbus, mysql, akonadiserver) properly on OSX and runs the
  tests.
........
  r1066697 | tilladam | 2009-12-27 20:06:13 +0100 (Sun, 27 Dec 2009) | 1 line
  
  Oops.
........
  r1066700 | tilladam | 2009-12-27 20:25:47 +0100 (Sun, 27 Dec 2009) | 1 line
  
  Use the right overload of disconnect.
........
  r1066754 | tilladam | 2009-12-27 22:00:53 +0100 (Sun, 27 Dec 2009) | 1 line
  
  Adjust to the OSX workaround here as well.
........
  r1066755 | tilladam | 2009-12-27 22:00:56 +0100 (Sun, 27 Dec 2009) | 1 line
  
  Adjust to the temp path work around here as well.
........
  r1066756 | tilladam | 2009-12-27 22:01:01 +0100 (Sun, 27 Dec 2009) | 1 line
  
  Find the testrunner executables on OSX too.
........
  r1066768 | tilladam | 2009-12-27 22:32:52 +0100 (Sun, 27 Dec 2009) | 1 line
  
  Make sure to shut down kded as well.
........
  r1067023 | vkrause | 2009-12-28 20:02:39 +0100 (Mon, 28 Dec 2009) | 3 lines
  
  Also disable default notes resource creation, fixes unit tests for
  Akonadi::Monitor.
........

svn path=/trunk/KDE/kdepimlibs/; revision=1067473
parent 075e1b88
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment