summaryrefslogtreecommitdiff
path: root/cmake/test
Commit message (Collapse)AuthorAgeFilesLines
* Revert "made session service dirs customizable: cmake part"Simon McVittie2012-01-041-3/+0
| | | | | This reverts commit 89e453216c02bb85c5e53d459997f8bc3b2c73d4. It makes the tests fail under autotools.
* made session service dirs customizable: cmake partRalf Habacker2011-11-211-0/+3
|
* Remove EXT variable from CMake, just use Automake-compatible EXEEXTSimon McVittie2011-09-281-1/+1
| | | | | | | | | According to Ralf, there's no standard name for this in CMake, so we might as well use the standard Automake name. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
* Merge tests' cmake and autotools bus configurationSimon McVittie2011-09-281-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Unix, the tests listened on both debug-pipe (which is a socketpair, or a TCP emulation of socketpair on Windows) and a Unix socket. In the Windows port, the tests were hard-coded to listen on a particular port, which allowed the dispatch test to connect to that port, as long as no two tests ran simultaneously (which I don't think was ever guaranteed - make -j can violate this). That's valid out-of-process, and also fully-specified, so they only needed one <listen> directive, so the CMake input only had one. To make the tests work under CMake on Unix, there was a hack: the string substituted for the content of the <listen> directive contained </listen><listen> to get the other address in, which is pretty nasty. Instead of doing that, I've made both build systems, on both Unix and Windows, use both debug-pipe and a more normal transport (Unix or TCP). debug-pipe has a Windows implementation and it's used in dbus-spawn-win.c, so it'd better work. The use of debug-pipe is now hard-coded rather than being a configure parameter (there's no reason to vary it in different builds), and I used TEST_LISTEN as the name of the Unix/TCP address, because it's a "vague" address (no specific Unix path, no TCP port), that you can listen on but not connect to. This in turn means that we can merge the Autoconf .in and CMake .cmake files, similar to Bug #41033. You might wonder why I've kept debug-pipe. I did try to get rid of it, but it turns out that the tests in dispatch.c rely on dbus_connection_open_private() not blocking, and normal socket connections block on connect(). Until we fix that by adding an async version of dbus_connection_open_private(), it won't be safe to have a test like dispatch.c that "talks to itself", unless it uses a transport as trivial as debug-pipe in which neither end has to block on the other. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
* Simplify linking for tests that use libdbus-testutilsSimon McVittie2011-07-292-15/+9
| | | | | | | | | | This is the library used by tests that link libdbus-internal and DBusLoop. By linking libdbus-internal into it, we can avoid having to repeat that dependency all over the place - libtool and cmake both know how to follow recursive dependencies. In cmake, also use libdbus-testutils for more tests, in preference to repeating its source files.
* Import compiler.m4 and lcov.am from telepathy-glib, and use them to replace gcovSimon McVittie2011-02-171-7/+0
| | | | | Reviewed-by: Colin Walters <walters@verbum.org> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10887
* Keep in sync with automake.Ralf Habacker2010-12-041-0/+4
|
* Added missing test libraries and tools to keep in sync with autotools.Ralf Habacker2010-04-132-0/+26
|
* Keep test file directories in sync with autotoolsRalf Habacker2010-04-131-10/+12
|
* Cmake build system cleanup.Ralf Habacker2010-04-111-57/+57
| | | | Converted tabs to spaces and removed trailing spaces in test dir.
* Cmake support for cross plattform usable test files.Ralf Habacker2010-04-111-7/+0
| | | | | | | | | | | | Recent test configuration files contains 'unix:...' bus adresses which do not work on windows. For cross plattform usable test files the whole listen tag entry has to be set by the build system, which is available with a new build system variable named TEST_LISTEN. To have the client client side definition in sync, TEST_CONNECTION has been moved from c file into cmake build system.
* Simplified cmake specific test file generating.Ralf Habacker2010-04-091-67/+24
| | | | | | | If there is a *.cmake test file available for a related *.in file, take the *.cmake test file instead of the *.in file as test file source. Also added some messages.
* Keep cmake build system in sync with commit ↵Ralf Habacker2010-03-221-5/+0
| | | | d47154c28b68b32177773bd489fdae62b440f38c.
* Make the windows binaries and build match the linux one with cmake buildsystem.unknown2010-03-221-0/+2
| | | | | This is performed by including the files from the client lib in the internal one and by removing the linking to dbus-1 for targets using the internal library.
* CMake dbus libraries usage cleanup.Ralf Habacker2010-03-202-14/+12
| | | | | | Renamed DBUS_LIBRARIES to DBUS_INTERNAL_LIBRARIES and moved to top level CMakeLists.txt. Removed obsolate references of dbus-internal library. Added DBUS_LIBRARIES definition which contains only the dbus library.
* fixed bus-test sha1 connection address on unix with cmake build systemRalf Habacker2010-03-081-1/+6
|
* commented bits cleanupRomain Pokrzywka2010-02-072-36/+0
|
* now fix the build for the tests; turns out we need another set of exports, ↵Romain Pokrzywka2010-02-072-12/+14
| | | | since some tests are compiled in the client lib and some are in the internal lib...
* readded test files required for windowsRalf Habacker2009-12-011-0/+10
|
* do not run test binaries as unit tests if they aren't unit tests (cherry ↵Frank Osterfeld2009-11-301-10/+0
| | | | picked from commit 5281f5b113bd97152d1c9eac050432bda3274748)
* fix warning, use Sleep, not _sleep on windows (cherry picked from commit ↵Frank Osterfeld2009-11-301-4/+0
| | | | ea36c743ad60a2dd5c6286571d1a475903519809)
* fix TEST_SOCKET_DIR on windows, do not override value from top-level in ↵Frank Osterfeld2009-11-301-2/+0
| | | | test/ (cherry picked from commit fde144333281348cda2d533331946996d7a09bff)
* bus-test-launch-helper is a unit test, test-service and test-shell-service ↵Frank Osterfeld2009-11-301-11/+4
| | | | are not. Rename test-shell to shell-test to match autotools (cherry picked from commit b106387b73d6a300a013a15f6507244e82f007ed)
* Use correct sources to build test-shell-service, fixes a hang in bus-test ↵Frank Osterfeld2009-11-301-1/+1
| | | | (cherry picked from commit 0afe04db5152b57582863bef83a55d78020a79c6)
* removed obsolate filesRalf Habacker2009-11-302-31/+0
|
* cleanup: these files are already generated elsewhere (cherry picked from ↵Frank Osterfeld2009-11-301-16/+0
| | | | commit 21f66df24affd4a4d2fb3324fb51899c811530da)
* rename test-spawn to spawn-test, to match autotools. test-sleep-forever is ↵Frank Osterfeld2009-11-301-6/+4
| | | | not a stand-alone test but called from other tests (cherry picked from commit 41bf95167cfc17b564594eab0a1901e46eaab5fe)
* fix test and binary names (cherry picked from commit ↵Frank Osterfeld2009-11-301-2/+2
| | | | 18bcf5f2d474456c57cd94da234005a23e2589a7)
* rename second test-names to test-names2 to avoid confusion (cherry picked ↵Frank Osterfeld2009-11-301-4/+3
| | | | from commit c83a2d79bb215b19b02987c9a45ed1bf07e5eeaf)
* generate all config files from the .in files. Set some of the required ↵Frank Osterfeld2009-11-301-0/+19
| | | | variables replaced in the .in files by configure_file (cherry picked from commit 4980ffa1093877af182e032a13f6162df57be09f)
* merge changes done to the cmake-buildsystem from the sf.net windbus-svn ↵Christian Ehrlicher2009-11-302-31/+32
| | | | trunk. tested and works fine with at least msvc2008. (cherry picked from commit 45c168fd61e3f6447e014df4bb6417efbe725ccd)
* * cmake/: don't install test applications and service files, moved ↵Ralf Habacker2007-04-282-10/+10
| | | | CMAKE_DEBUG_POSTFIX to top level CMakeLists.txt
* * cmake: new directory, contains cmake build support.Ralf Habacker2007-03-034-0/+306
See http://www.cmake.org for more informations. Currently only unix will be buildable because some win32 required files are still missing.
View Lorry Controller Status