summaryrefslogtreecommitdiff
path: root/test/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2014-01-17Rename shell-test to test-shell to match common test application naming scheme.Ralf Habacker1-3/+4
[Add its source file to SOURCES: this test was previously relying on the Automake feature that the default value of foo_bar_SOURCES is foo-bar.c. -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-17Rename dbus-test to test-dbus to match common test application naming scheme.Ralf Habacker1-1/+1
[reverted the dbus-specification part -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2014-01-10tests: don't block and wait for a debugger on abortSimon McVittie1-1/+0
In general, I think developers running the tests would expect them to terminate rather than hanging. Developers who want to debug such an abort by attaching a debugger to a live process can still set DBUS_BLOCK_ON_ABORT in the environment. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2014-01-06Make sure tests run with a temporary XDG_RUNTIME_DIRSimon McVittie1-1/+3
We don't want the regression tests' "session" getting mixed up in system-wide "sessions". This doesn't actually matter yet, but it is likely to matter in future. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61301 Reviewed-by: Chengwei Yang <chengwei.yang@intel.com> [merged with earlier line-wrapping of TESTS_ENVIRONMENT -smcv] Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-10$(in_data) is meant to contain the .in filesSimon McVittie1-1/+1
Reviewed-by: Colin Walters
2013-10-10test: Update build for previous commitColin Walters1-1/+1
It should now be in in_data so we find it in $(srcdir).
2013-09-05Use GNU make features to reduce repetitionSimon McVittie1-5/+1
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48277 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
2013-09-05Add CPPFLAGS to "shared if possible" test binariesSimon McVittie1-8/+16
In principle we ought to define DBUS_STATIC_BUILD in anything that's using libdbus-internal.la (to avoid linking failures on statically-linked mingw builds), and DBUS_TEST_USE_INTERNAL in any test that's using the non-dbus-glib code paths of test-utils.[ch] (to avoid the GLib requirement, although in practice, everything "shared if possible" requires GLib at the moment anyway). Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2013-09-03Tests: allow dbus-glib to be replaced with use of libdbus-internalSimon McVittie1-28/+56
We only use dbus-glib for its main loop; within dbus, DBusLoop is available as an alternative, although it isn't thread-safe and isn't public API. For tests that otherwise only use libdbus public API, it's desirable to be able to avoid DBusLoop, so we can run them against an installed libdbus as an integration test. However, if we don't have dbus-glib, we're going to have to use an in-tree main loop, which might as well be DBusLoop. The major disadvantage of using dbus-glib is that it isn't safe to link both dbus-1 and dbus-internal at the same time. This is awkward for a future test case that wants to use _dbus_getsid() in dbus-daemon.c, but only on Windows (fd.o #54445). If we use the same API wrapper around both dbus-glib and DBusLoop, we can compile that test against dbus-glib or against DBusLoop, depending on the platform. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2013-09-03Define DBUS_COMPILATION externally for all tests that use internal stuffSimon McVittie1-0/+1
It might as well go in the AM_CPPFLAGS rather than in the source code. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2013-08-23Manual rebase fix.Ralf Habacker1-1/+1
2013-08-23Add a simple manual test for authentication/authorization.Simon McVittie1-2/+12
Bug: http://bugs.freedesktop.org/show_bug.cgi?id=39720 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
2013-06-28tests to embedded tests: replaced in automake filesChengwei Yang1-3/+3
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66291
2013-06-12Add a test-case for CVE-2013-2168Simon McVittie1-0/+5
Reviewed-by: Thiago Macieira <thiago@kde.org> [build system adjusted to compile it even if we don't have GLib -smcv]
2012-06-15When not producing a dynamic library, define DBUS_STATIC_BUILDSimon McVittie1-0/+3
When targeting Windows, linking against the static library requires special effort to turn off DLL import/export processing. We normally link some things against the dynamic library, but if we're not building that, we'll have to link everything statically. Based on patches from 'william' on fd.o #46367. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33973 Tested-by: René Berber <Rene.Berber gmail com>
2012-06-05Fix distcheck: remove potentially-read-only files from builddirSimon McVittie1-0/+1
During distcheck, the srcdir is read-only. During "make all", cp may preserve the read-only status of the file copied from the srcdir, resulting in failure to overwrite it with an identical file during "make check" (which depends on all-local). Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2012-04-25Merge branch 'dbus-1.4'Simon McVittie1-7/+7
Conflicts: NEWS dbus/dbus-internals.c dbus/dbus-mainloop.c dbus/dbus-sysdeps-unix.c dbus/dbus-sysdeps-win.c dbus/dbus-sysdeps.c dbus/dbus-sysdeps.h
2012-04-25use cp and mkdir -p instead of install within source treeAntoine Jacoutot1-7/+7
$(INSTALL) and $(INSTALL_DATA) try to change ownerships to root:bin when copying tests to builddir. Presumably this is a difference in behaviour between GNU and BSD install(1): the one in GNU coreutils doesn't try-and-fail to change ownership if you're not root. [Commit message added by smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48127 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2012-03-12Merge branch 'dbus-1.4'Simon McVittie1-83/+131
2012-03-12Enumerate data files used in the build rather than using find(1)Simon McVittie1-83/+130
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33840 Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2012-02-24Add a regression test for validating various string types with the public APISimon McVittie1-0/+5
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39549 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2012-02-21Mark shell-test as modular and installableSimon McVittie1-9/+3
This test needs non-public API and so is statically linked, but is OK to install. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42811 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2012-02-21Allow a reduced set of installable tests (none yet) to be built without GLibSimon McVittie1-0/+5
--enable-modular-tests=auto will build as many as possible, perhaps excluding the GLib ones. --enable-modular-tests=yes or --enable-tests=yes will insist on having GLib, to be able to run everything. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42811 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2012-01-04Revert all changes since a36d4918a6f646e085Simon McVittie1-46/+60
Someone seems to have merged part of master into 1.4. Again. Let's go back to the "last known good" point (the branch-point of some 1.4 branches I had locally), then we can cherry-pick the changes that should have gone in.
2011-12-21Merge branch 'dbus-1.4' of ssh://git.freedesktop.org/git/dbus/dbus into dbus-1.4Ralf Habacker1-0/+1
2011-11-02Merge branch 'dbus-1.4'Simon McVittie1-0/+1
2011-11-02Set DBUS_TEST_HOMEDIR when running installcheckSimon McVittie1-0/+1
This avoids spamming ~/.dbus and ~/.dbus-keyrings with filesystem activity while running the tests. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41218 Reviewed-by: Lennart Poettering <lennart@poettering.net>
2011-09-21Fix compilation of syslog test in masterSimon McVittie1-2/+2
2011-09-21Merge branch 'dbus-1.4'Simon McVittie1-1/+8
Conflicts: NEWS
2011-09-21Add a semi-automatic test for _dbus_system_logSimon McVittie1-0/+5
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39987 Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-09-21Make "make -C test clean" idempotentSimon McVittie1-1/+3
Previously, it'd fail when done twice, because you can't rmdir a nonexistent directory. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40004 Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-08-12Fix linking of libdbus-testutils.la with Automake targeting WindowsSimon McVittie1-5/+7
This regressed in commit 9875480ed - libdbus-testutils.la needs static linking too.
2011-08-05Merge branch 'dbus-1.4'Simon McVittie1-0/+5
Conflicts: bus/main.c
2011-08-05Add a regression test for fd.o #38005Simon McVittie1-0/+5
(The dbus-1.4 version.) Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39836 Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-07-29test, test/name-test: remove SOURCES where they can be inferred from the ↵Simon McVittie1-27/+0
name of the executable
2011-07-29test: promote GLIB_CFLAGS, DBUS_GLIB_CFLAGS to top level and use AM_CPPFLAGSSimon McVittie1-6/+5
INCLUDES is a deprecated way to get the same effect as AM_CPPFLAGS. It's harmless to add extra -I directories to all the tests, even those that use neither GLib nor dbus-glib, so we can simplify by setting these AM_CPPFLAGS for the whole directory.
2011-07-29test: reverse assumption regarding static/dynamic linkingSimon McVittie1-3/+10
If we change the default assumption to be that new tests will be dynamically-linked to libdbus, those tests can be useful for installcheck or even for installation. Accordingly, explicitly use new variable $(static_cppflags) for all tests that need static linking.
2011-07-29Simplify linking for tests that use libdbus-testutilsSimon McVittie1-5/+11
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.
2011-07-29Don't explicitly link thread and network libs into various testsSimon McVittie1-8/+7
These tests get everything they need from the public or internal API of libdbus-internal.la, and libtool knows how to pull in libraries' dependencies, so we don't need explicit linking. spawn-test and break-loader don't actually need test-utils.[ch] either.
2011-07-29Simplify linking by moving -export-dynamic to AM_LDFLAGSSimon McVittie1-11/+3
2011-07-29Remove DBUS_TEST_CFLAGS, which is emptySimon McVittie1-1/+1
2011-07-18Merge branch 'dbus-1.4' and update NEWS for masterSimon McVittie1-5/+36
Conflicts: NEWS
2011-07-18Use EXEEXT when running tests from another directory, and skip ↵Simon McVittie1-4/+7
bus-test-launch-helper on non-Unix This is necessary when cross-compiling from Linux to mingw32 and running the resulting tests under Wine. (This partially works! Some tests fail, though.) Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-07-18Run bus tests from test/Simon McVittie1-0/+5
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405 Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-07-18Run dbus-test from test/, not dbus/Simon McVittie1-1/+10
This avoids failures caused by test/data not having been set up yet. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405 Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-07-18test/Makefile.am: list tests one per lineSimon McVittie1-4/+18
This improves clarity, and makes conflicts less likely and merges more obviously correct. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405 Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-07-14Add testsuite for eavesdrop=true DBusMatchRuleCosimo Alfarano1-0/+8
[with some typos fixed during commit -smcv] Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37890 Bug-NB: NB#269748
2011-06-10fix installable tests to not install if unwantedSimon McVittie1-1/+1
2011-06-10Add a test for marshalling and endian-swappingSimon McVittie1-0/+8
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38120
2011-06-10installcheck: don't run installed tests against installed library if in a ↵Simon McVittie1-0/+4
DESTDIR That probably won't work, because it'll find the system-wide library which might be older. Reviewed-by: Will Thompson <will.thompson@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34570