summaryrefslogtreecommitdiff
path: root/test/bus/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/bus/main.c')
-rw-r--r--test/bus/main.c33
1 files changed, 2 insertions, 31 deletions
diff --git a/test/bus/main.c b/test/bus/main.c
index 445e9269..16c0ac20 100644
--- a/test/bus/main.c
+++ b/test/bus/main.c
@@ -23,32 +23,7 @@
*/
#include <config.h>
-
-#include "bus/test.h"
-
-#include <dbus/dbus-test-tap.h>
-
-#include "bus/audit.h"
-#include "bus/selinux.h"
-#include "test/test-utils.h"
-
-#ifndef DBUS_ENABLE_EMBEDDED_TESTS
-#error This file is only relevant for the embedded tests
-#endif
-
-static void
-test_pre_hook (void)
-{
-}
-
-static void
-test_post_hook (void)
-{
- if (_dbus_getenv ("DBUS_TEST_SELINUX"))
- bus_selinux_shutdown ();
-
- bus_audit_shutdown ();
-}
+#include "test/bus/common.h"
static DBusTestCase tests[] =
{
@@ -63,9 +38,5 @@ static DBusTestCase tests[] =
int
main (int argc, char **argv)
{
- return _dbus_test_main (argc, argv, _DBUS_N_ELEMENTS (tests), tests,
- (DBUS_TEST_FLAGS_CHECK_MEMORY_LEAKS |
- DBUS_TEST_FLAGS_CHECK_FD_LEAKS |
- DBUS_TEST_FLAGS_REQUIRE_DATA),
- test_pre_hook, test_post_hook);
+ return bus_test_main (argc, argv, _DBUS_N_ELEMENTS (tests), tests);
}