SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus: fix running tests in parallel

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2013-12-27 15:48:15 -05:00
parent a9a305332b
commit 79ccff06c1
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-bus/test-bus-kernel-benchmark.c
+4 -2
View File
@@ -220,7 +220,7 @@ int main(int argc, char *argv[]) {
MODE_CHART, MODE_CHART,
} mode = MODE_BISECT; } mode = MODE_BISECT;
int i; 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; _cleanup_close_ int bus_ref = -1;
cpu_set_t cpuset; cpu_set_t cpuset;
size_t result; 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) if (bus_ref == -ENOENT)
exit(EXIT_TEST_SKIP); exit(EXIT_TEST_SKIP);
src/libsystemd-bus/test-bus-kernel-bloom.c
+4 -2
View File
@@ -37,12 +37,14 @@ static void test_one(
bool good) { bool good) {
_cleanup_close_ int bus_ref = -1; _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_message_unref_ sd_bus_message *m = NULL;
sd_bus *a, *b; sd_bus *a, *b;
int r; 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) if (bus_ref == -ENOENT)
exit(EXIT_TEST_SKIP); exit(EXIT_TEST_SKIP);
src/libsystemd-bus/test-bus-kernel.c
+4 -2
View File
@@ -33,7 +33,7 @@
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
_cleanup_close_ int bus_ref = -1; _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_message_unref_ sd_bus_message *m = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
const char *ua = NULL, *ub = NULL, *the_string = 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) if (bus_ref == -ENOENT)
return EXIT_TEST_SKIP; return EXIT_TEST_SKIP;
src/libsystemd-bus/test-bus-zero-copy.c
+4 -2
View File
@@ -38,7 +38,7 @@
#define STRING_SIZE 123 #define STRING_SIZE 123
int main(int argc, char *argv[]) { 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; uint8_t *p;
sd_bus *a, *b; sd_bus *a, *b;
int r, bus_ref; 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) if (bus_ref == -ENOENT)
return EXIT_TEST_SKIP; return EXIT_TEST_SKIP;