tests: Call dbus_shutdown()

Not all of these tests will be fully valgrind-clean yet (or perhaps
ever), but it's easier to add this to all of them than to think
about it.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107194

diff --git a/test/containers.c b/test/containers.c
index fe099831d159d75bcf03ea5e03469d6baa8782ad..dd1104ea5392a0215132e9fa45b0dff491f4bc0f 100644 (file)
--- a/test/containers.c
+++ b/test/containers.c
@@ -1770,5 +1770,6 @@ main (int argc,
   g_free (runtime_services_dir);
   g_free (runtime_dbus_dir);
   g_free (runtime_dir);
+  dbus_shutdown ();
   return ret;
 }

diff --git a/test/corrupt.c b/test/corrupt.c
index 4eaa04ff0b55d65368beae1befd5763cdce849a8..be5314b4075e12f43a54c5bee1bdfa81fb88a321 100644 (file)
--- a/test/corrupt.c
+++ b/test/corrupt.c
@@ -403,6 +403,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/corrupt/tcp", Fixture, "tcp:host=127.0.0.1", setup,
@@ -421,5 +423,7 @@ main (int argc,
       test_byte_order, teardown);
 #endif
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/dbus-daemon-eavesdrop.c b/test/dbus-daemon-eavesdrop.c
index d2c0872df89441e845576386e70db8e5e2312720..be21d0ab4da936e34f77620a47575ae876aa43bc 100644 (file)
--- a/test/dbus-daemon-eavesdrop.c
+++ b/test/dbus-daemon-eavesdrop.c
@@ -421,6 +421,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/eavedrop/match_keyword/broadcast", Fixture, NULL,
@@ -431,5 +433,7 @@ main (int argc,
   g_test_add ("/eavedrop/match_keyword/unicast_to_sender", Fixture, NULL,
       setup, test_eavesdrop_unicast_to_sender, teardown);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c
index d25267ae04084723acb22ab2e99ac350217aa089..f8ffbee241ab22fa1fd8d9d689ee170b5b7a462b 100644 (file)
--- a/test/dbus-daemon.c
+++ b/test/dbus-daemon.c
@@ -2054,6 +2054,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/echo/session", Fixture, NULL, setup, test_echo, teardown);
@@ -2131,5 +2133,7 @@ main (int argc,
               setup, test_fd_limit, teardown);
 #endif
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/fdpass.c b/test/fdpass.c
index 871d9f53379704f03549e07173b86a5e599b7a0d..1d8ee605f5dff3d52673d1f0b747ae0dcd3356f0 100644 (file)
--- a/test/fdpass.c
+++ b/test/fdpass.c
@@ -877,6 +877,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
 #ifdef HAVE_GETRLIMIT
@@ -940,5 +942,7 @@ main (int argc,
   g_test_add ("/odd-limit/plus2", Fixture, GINT_TO_POINTER (+2), setup,
       test_odd_limit, teardown);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/header-fields.c b/test/header-fields.c
index 019ff21818257b76d1a7a5ee48f46f20a7047ba3..b0d89d6167b4f411a00b584e99e863c0f66ad595 100644 (file)
--- a/test/header-fields.c
+++ b/test/header-fields.c
@@ -826,5 +826,6 @@ main (int argc,
   ret = g_test_run ();
 
   g_queue_free_full (test_cases_to_free, g_free);
+  dbus_shutdown ();
   return ret;
 }

diff --git a/test/internals/printf.c b/test/internals/printf.c
index fb8f35529c8769e0d842906fa6009641ae296e29..1160b2ae9c27d989b187a3ff62ce9477f0ee0d8a 100644 (file)
--- a/test/internals/printf.c
+++ b/test/internals/printf.c
@@ -105,5 +105,6 @@ main (int argc,
    * This is how it can distinguish between an unexpected exit and
    * successful completion. */
   printf ("1..%d\n", test_num);
+  dbus_shutdown ();
   return 0;
 }

diff --git a/test/internals/refs.c b/test/internals/refs.c
index e68f6606a8dbcfe068d068ef74def5b77420e23a..89f581aa89d319303d2f9a0966c9192ed047b25e 100644 (file)
--- a/test/internals/refs.c
+++ b/test/internals/refs.c
@@ -622,6 +622,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/refs/connection", Fixture, NULL, setup_connection,
@@ -633,5 +635,7 @@ main (int argc,
   g_test_add ("/refs/server", Fixture, NULL, setup,
       test_server, teardown);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/internals/server-oom.c b/test/internals/server-oom.c
index 5d7fa4d05c18b597451bdce257ec55d29c5dd053..605566c89b2104f986d339daedc295fdae20b501 100644 (file)
--- a/test/internals/server-oom.c
+++ b/test/internals/server-oom.c
@@ -137,5 +137,6 @@ main (int argc,
   ret = g_test_run ();
 
   g_queue_free_full (test_cases_to_free, g_free);
+  dbus_shutdown ();
   return ret;
 }

diff --git a/test/internals/syslog.c b/test/internals/syslog.c
index e69c14a16ae47682b76d7fdc77657d4fc61b704e..01236e96b467ecc659235b3d469e6d845b6b2aa9 100644 (file)
--- a/test/internals/syslog.c
+++ b/test/internals/syslog.c
@@ -102,10 +102,14 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/syslog/normal", Fixture, NULL, setup, test_syslog_normal,
               teardown);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/internals/variant.c b/test/internals/variant.c
index 69954e7abee86a761abc368e56ccc080c1ad7de0..e5135429bd77e2f140637b96697016faba11d5c0 100644 (file)
--- a/test/internals/variant.c
+++ b/test/internals/variant.c
@@ -564,10 +564,14 @@ int
 main (int argc,
       char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add_func ("/variant/simple", test_simple);
   g_test_add_func ("/variant/oom", test_oom_handling);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/loopback.c b/test/loopback.c
index fdade49465fe45b69aae3566f2bb44ad8d7443d5..ad7e0e94ae59cfbd1ca4bfa2c83980ae1a6cd684 100644 (file)
--- a/test/loopback.c
+++ b/test/loopback.c
@@ -479,6 +479,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/connect/tcp", Fixture, "tcp:host=127.0.0.1", setup,
@@ -515,5 +517,7 @@ main (int argc,
       test_bad_guid, teardown);
 #endif
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/marshal.c b/test/marshal.c
index 3353ec0015a31b2762f119bdfe45f67f442fccd8..f10bb1c25830b22a9cbd10fb1a270c17fa4ef832 100644 (file)
--- a/test/marshal.c
+++ b/test/marshal.c
@@ -271,5 +271,6 @@ main (int argc,
   ret = g_test_run ();
   g_free (aligned_le_blob);
   g_free (aligned_be_blob);
+  dbus_shutdown ();
   return ret;
 }

diff --git a/test/message.c b/test/message.c
index 7141e314ae58d1d70651736e61cf495523418c2f..9aee025c609fc663fce57ec012a02e920210e9a2 100644 (file)
--- a/test/message.c
+++ b/test/message.c
@@ -310,5 +310,6 @@ main (int argc,
   ret = g_test_run ();
 
   g_queue_free_full (test_cases_to_free, g_free);
+  dbus_shutdown ();
   return ret;
 }

diff --git a/test/monitor.c b/test/monitor.c
index 95b394bf3ec263380a80954daa132e02867ac4aa..978ef30f3ea95bd207c6aae0e41407508a4aa9cc 100644 (file)
--- a/test/monitor.c
+++ b/test/monitor.c
@@ -1955,6 +1955,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/monitor/invalid", Fixture, NULL,
@@ -1998,5 +2000,7 @@ main (int argc,
       setup, test_activation, teardown);
 #endif
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/relay.c b/test/relay.c
index 657f5fd3b82a1570151bd34f8f9025291b4b0880..044260afa975da1e3fe66f509dcffb3983265f0a 100644 (file)
--- a/test/relay.c
+++ b/test/relay.c
@@ -337,6 +337,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/connect/tcp", Fixture, "tcp:host=127.0.0.1", setup,
@@ -355,5 +357,7 @@ main (int argc,
       test_limit, teardown);
 #endif
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/sd-activation.c b/test/sd-activation.c
index add2c2644af9f8ca22c675fbdfac1ed2f4188697..b5a08bcebc533e63cd6e4fcd2562cdd9f8c4ff60 100644 (file)
--- a/test/sd-activation.c
+++ b/test/sd-activation.c
@@ -1056,6 +1056,7 @@ main (int argc,
     char **argv)
 {
   gsize i;
+  int ret;
 
   test_init (&argc, &argv);
 
@@ -1089,5 +1090,7 @@ main (int argc,
   g_test_add ("/sd-activation/transient-services/in-advance", Fixture,
       &transient_service_in_advance, setup, test_transient_services, teardown);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/shell-test.c b/test/shell-test.c
index 794757f343baba624c3e99d7184c11edf5d92d23..d01dce8e4608a881f87eb971ce2dd58a0fd90a80 100644 (file)
--- a/test/shell-test.c
+++ b/test/shell-test.c
@@ -184,5 +184,6 @@ main (int argc, char **argv)
    * successful completion. */
   printf ("1..%d\n", test_num);
 
+  dbus_shutdown ();
   return (num_failed != 0);
 }

diff --git a/test/spawn-test.c b/test/spawn-test.c
index a12c869fcd4e8e9c9d6480201accd9aba7241594..8d42f067c1a71790133c5a89b6c05c6b8293b7af 100644 (file)
--- a/test/spawn-test.c
+++ b/test/spawn-test.c
@@ -39,6 +39,6 @@ main (int argc, char **argv)
     }
 
   dbus_free(argv_copy);
- 
+  dbus_shutdown ();
   return 0;
 }

diff --git a/test/syntax.c b/test/syntax.c
index bf960c9ea4000a99232bebeedcda64ed3f6646df..17fcba4e9c00de7a6df8895dce29b34bffc35b20 100644 (file)
--- a/test/syntax.c
+++ b/test/syntax.c
@@ -271,6 +271,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/syntax/path", Fixture, &paths, setup, test_syntax, teardown);
@@ -289,5 +291,7 @@ main (int argc,
   g_test_add ("/syntax/utf8", Fixture, &strings,
       setup, test_syntax, teardown);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/test-names.c b/test/test-names.c
index eac79ee137b33344e6f4b638b093adc36bedc352..5ba77ae51228416f2c6367738f5bc110d2d919a5 100644 (file)
--- a/test/test-names.c
+++ b/test/test-names.c
@@ -74,6 +74,6 @@ main (int    argc,
 #endif
 
   _dbus_verbose ("*** Test service name exiting\n");
-  
+  dbus_shutdown ();
   return 0;
 }

diff --git a/test/thread-blocking.c b/test/thread-blocking.c
index e814dec3da9776d3cc3227802cc705fbe3840c03..69395f35d3b2da8721fcb123908e599b3501ec54 100644 (file)
--- a/test/thread-blocking.c
+++ b/test/thread-blocking.c
@@ -290,10 +290,14 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   g_test_add ("/thread-blocking", Fixture, NULL, setup, test_threads,
               teardown);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }

diff --git a/test/uid-permissions.c b/test/uid-permissions.c
index 4642ff37a6b32ebc64de8efea041990032a9fc2a..24f6f725e2110168e3254a803229dcc375b54154 100644 (file)
--- a/test/uid-permissions.c
+++ b/test/uid-permissions.c
@@ -238,6 +238,8 @@ int
 main (int argc,
     char **argv)
 {
+  int ret;
+
   test_init (&argc, &argv);
 
   /* UpdateActivationEnvironment used to be allowed by dbus-daemon for root
@@ -257,5 +259,7 @@ main (int argc,
   g_test_add ("/uid-permissions/monitor/other", Fixture, &other_fail_config,
       setup, test_monitor, teardown);
 
-  return g_test_run ();
+  ret = g_test_run ();
+  dbus_shutdown ();
+  return ret;
 }