test/bus: Factor out common setup/teardown code

Signed-off-by: Simon McVittie <smcv@collabora.com>

1 files changed, 2 insertions, 31 deletions

diff --git a/test/bus/dispatch-sha1.c b/test/bus/dispatch-sha1.c
index a32508bc..dc2dcb5d 100644
--- a/test/bus/dispatch-sha1.c
+++ b/test/bus/dispatch-sha1.c
@@ -22,41 +22,12 @@
  */
 
 #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 test = { "dispatch-sha1", bus_dispatch_sha1_test };
 
 int
 main (int argc, char **argv)
 {
-  return _dbus_test_main (argc, argv, 1, &test,
-                          (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, 1, &test);
 }