bus: fix running tests in parallel

diff --git a/src/libsystemd-bus/test-bus-kernel-benchmark.c b/src/libsystemd-bus/test-bus-kernel-benchmark.c
index 70f4fcd852834060fc5e0e8e8e6217598758fc60..04627d9a779475b700ca193782e1a9a1fa390cbb 100644 (file)
--- a/src/libsystemd-bus/test-bus-kernel-benchmark.c
+++ b/src/libsystemd-bus/test-bus-kernel-benchmark.c
@@ -220,7 +220,7 @@ int main(int argc, char *argv[]) {
                 MODE_CHART,
         } mode = MODE_BISECT;
         int i;
                 MODE_CHART,
         } mode = MODE_BISECT;
         int i;

-        _cleanup_free_ char *bus_name = NULL, *address = NULL;
+        _cleanup_free_ char *name = NULL, *bus_name = NULL, *address = NULL;

         _cleanup_close_ int bus_ref = -1;
         cpu_set_t cpuset;
         size_t result;
         _cleanup_close_ int bus_ref = -1;
         cpu_set_t cpuset;
         size_t result;


@@ -239,7 +239,9 @@ int main(int argc, char *argv[]) {
 
         assert_se(arg_loop_usec > 0);
 
 
         assert_se(arg_loop_usec > 0);
 

-        bus_ref = bus_kernel_create_bus("deine-mutter", false, &bus_name);
+        assert_se(asprintf(&name, "deine-mutter-%u", (unsigned) getpid()) >= 0);
+
+        bus_ref = bus_kernel_create_bus(name, false, &bus_name);

         if (bus_ref == -ENOENT)
                 exit(EXIT_TEST_SKIP);
 
         if (bus_ref == -ENOENT)
                 exit(EXIT_TEST_SKIP);
 

diff --git a/src/libsystemd-bus/test-bus-kernel-bloom.c b/src/libsystemd-bus/test-bus-kernel-bloom.c
index 772831bdd960b896a33249bafc1b1d23946611c2..0ecad18f45f2e32b0892158d033f693b53c585b5 100644 (file)
--- a/src/libsystemd-bus/test-bus-kernel-bloom.c
+++ b/src/libsystemd-bus/test-bus-kernel-bloom.c
@@ -37,12 +37,14 @@ static void test_one(
                 bool good) {
 
         _cleanup_close_ int bus_ref = -1;
                 bool good) {
 
         _cleanup_close_ int bus_ref = -1;

-        _cleanup_free_ char *bus_name = NULL, *address = NULL;
+        _cleanup_free_ char *name = NULL, *bus_name = NULL, *address = NULL;

         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
         sd_bus *a, *b;
         int r;
 
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
         sd_bus *a, *b;
         int r;
 

-        bus_ref = bus_kernel_create_bus("deine-mutter", false, &bus_name);
+        assert_se(asprintf(&name, "deine-mutter-%u", (unsigned) getpid()) >= 0);
+
+        bus_ref = bus_kernel_create_bus(name, false, &bus_name);

         if (bus_ref == -ENOENT)
                 exit(EXIT_TEST_SKIP);
 
         if (bus_ref == -ENOENT)
                 exit(EXIT_TEST_SKIP);
 

diff --git a/src/libsystemd-bus/test-bus-kernel.c b/src/libsystemd-bus/test-bus-kernel.c
index c78c6d42a4effac6ec937c6090762b2092a1b3f0..9b17a35e4aa9d1b67dd82b831c96996f5177e1f0 100644 (file)
--- a/src/libsystemd-bus/test-bus-kernel.c
+++ b/src/libsystemd-bus/test-bus-kernel.c
@@ -33,7 +33,7 @@
 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int bus_ref = -1;
 
 int main(int argc, char *argv[]) {
         _cleanup_close_ int bus_ref = -1;

-        _cleanup_free_ char *bus_name = NULL, *address = NULL;
+        _cleanup_free_ char *name = NULL, *bus_name = NULL, *address = NULL;

         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         const char *ua = NULL, *ub = NULL, *the_string = NULL;
         _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
         const char *ua = NULL, *ub = NULL, *the_string = NULL;


@@ -42,7 +42,9 @@ int main(int argc, char *argv[]) {
 
         log_set_max_level(LOG_DEBUG);
 
 
         log_set_max_level(LOG_DEBUG);
 

-        bus_ref = bus_kernel_create_bus("deine-mutter", false, &bus_name);
+        assert_se(asprintf(&name, "deine-mutter-%u", (unsigned) getpid()) >= 0);
+
+        bus_ref = bus_kernel_create_bus(name, false, &bus_name);

         if (bus_ref == -ENOENT)
                 return EXIT_TEST_SKIP;
 
         if (bus_ref == -ENOENT)
                 return EXIT_TEST_SKIP;
 

diff --git a/src/libsystemd-bus/test-bus-zero-copy.c b/src/libsystemd-bus/test-bus-zero-copy.c
index dff3692246d6494661f9f442cd4f7b50b80d6a50..5ad8ed54b0fccce3c18ac6fbfaa91874038cdce9 100644 (file)
--- a/src/libsystemd-bus/test-bus-zero-copy.c
+++ b/src/libsystemd-bus/test-bus-zero-copy.c
@@ -38,7 +38,7 @@
 #define STRING_SIZE 123
 
 int main(int argc, char *argv[]) {
 #define STRING_SIZE 123
 
 int main(int argc, char *argv[]) {

-        _cleanup_free_ char *bus_name = NULL, *address = NULL;
+        _cleanup_free_ char *name = NULL, *bus_name = NULL, *address = NULL;

         uint8_t *p;
         sd_bus *a, *b;
         int r, bus_ref;
         uint8_t *p;
         sd_bus *a, *b;
         int r, bus_ref;


@@ -51,7 +51,9 @@ int main(int argc, char *argv[]) {
 
         log_set_max_level(LOG_DEBUG);
 
 
         log_set_max_level(LOG_DEBUG);
 

-        bus_ref = bus_kernel_create_bus("deine-mutter", false, &bus_name);
+        assert_se(asprintf(&name, "deine-mutter-%u", (unsigned) getpid()) >= 0);
+
+        bus_ref = bus_kernel_create_bus(name, false, &bus_name);

         if (bus_ref == -ENOENT)
                 return EXIT_TEST_SKIP;
 
         if (bus_ref == -ENOENT)
                 return EXIT_TEST_SKIP;