summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-11-17 11:53:13 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-17 11:57:15 +0900
commit28d74624ec6cb1b3bd405c3e933e9d7b2a700404 (patch)
tree1d9ba75a09c42729ae513ba6fd0fae4aa315b44c
parentbae51a061267a958cc1d9662623e2fef27b9a3d6 (diff)
downloadefl-28d74624ec6cb1b3bd405c3e933e9d7b2a700404.tar.gz
tests/eldbus: Use different bus for cxx and C tests
I had eldbus_suite and eldbus_cxx_suite fail quite often for some strange reason: name already in use... yeah but by who??? Turns out both test cases used the same name, and when ran in parallel (make -j10 check) this would often fail.
-rw-r--r--src/tests/eldbus/eldbus_fake_server.h2
-rw-r--r--src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/tests/eldbus/eldbus_fake_server.h b/src/tests/eldbus/eldbus_fake_server.h
index 00b4c86573..a8a1f52fdf 100644
--- a/src/tests/eldbus/eldbus_fake_server.h
+++ b/src/tests/eldbus/eldbus_fake_server.h
@@ -3,7 +3,7 @@
#include <Eldbus.h>
-#define FAKE_SERVER_BUS "org.Enlightenment"
+#define FAKE_SERVER_BUS "org.Enlightenment.Test"
#define FAKE_SERVER_PATH "/org/enlightenment"
#define FAKE_SERVER_INTERFACE "org.enlightenment.FakeServer"
#define FAKE_SERVER_READONLY_PROPERTY "r"
diff --git a/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc b/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc
index 95eed8c8c4..485ea94c53 100644
--- a/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc
+++ b/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc
@@ -11,9 +11,9 @@
#include "eldbus_cxx_suite.h"
-const char g_bus[] = "org.Enlightenment";
+const char g_bus[] = "org.Enlightenment.TestCxx";
const char g_path[] = "/org/enlightenment";
-const char g_interface[] = "org.enlightenment.Test";
+const char g_interface[] = "org.enlightenment.FakeServer";
static void
on_name_request(std::error_code const& ec, efl::eldbus::const_message