Fix some test cases using the same configuration directory.

diff --git a/test/channels-aio-cornercases.c b/test/channels-aio-cornercases.c
index 1116866e34ead850d0b908efdfc343baa9d403e1..0640c7df6e6de513bedea610f2f4c8d282f0d3a9 100644 (file)
--- a/test/channels-aio-cornercases.c
+++ b/test/channels-aio-cornercases.c
@@ -120,7 +120,7 @@ int main(int argc, char *argv[]) {
        // Open two new meshlink instance.
 
        meshlink_handle_t *mesh_a, *mesh_b;
-       open_meshlink_pair(&mesh_a, &mesh_b, "channels_aio");
+       open_meshlink_pair(&mesh_a, &mesh_b, "channels_aio_cornercases");
 
        // Set the callbacks.
 

diff --git a/test/channels-fork.c b/test/channels-fork.c
index 30f7cf8ecb35b61d2c3e6cca9b54d945b4d40fb0..483f430b88bee52be1aa82421e81538877f5786b 100644 (file)
--- a/test/channels-fork.c
+++ b/test/channels-fork.c
@@ -91,7 +91,7 @@ static int main1(int rfd, int wfd) {
        meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
        assert(meshlink_destroy("channels_fork_conf.1"));
-       meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.1", "foo", "channels", DEV_CLASS_BACKBONE);
+       meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.1", "foo", "channels-fork", DEV_CLASS_BACKBONE);
        assert(mesh);
 
        meshlink_enable_discovery(mesh, false);
@@ -147,7 +147,7 @@ static int main2(int rfd, int wfd) {
        meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
        assert(meshlink_destroy("channels_fork_conf.2"));
-       meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.2", "bar", "channels", DEV_CLASS_BACKBONE);
+       meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.2", "bar", "channels-fork", DEV_CLASS_BACKBONE);
        assert(mesh);
 
        meshlink_enable_discovery(mesh, false);

diff --git a/test/get-all-nodes.c b/test/get-all-nodes.c
index 3340982b15f6f5a33a1d7371db853544a2e5d79b..815dc7df328376254f002c7b1c37918deb0c0e96 100644 (file)
--- a/test/get-all-nodes.c
+++ b/test/get-all-nodes.c
@@ -36,10 +36,10 @@ int main(void) {
        assert(meshlink_destroy("get_all_nodes_conf.3"));
 
        meshlink_handle_t *mesh[3];
-       mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "import-export", DEV_CLASS_BACKBONE);
+       mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "get-all-nodes", DEV_CLASS_BACKBONE);
        assert(mesh[0]);
 
-       mesh[1] = meshlink_open("get_all_nodes_conf.2", "bar", "import-export", DEV_CLASS_STATIONARY);
+       mesh[1] = meshlink_open("get_all_nodes_conf.2", "bar", "get-all-nodes", DEV_CLASS_STATIONARY);
        assert(mesh[1]);
 
        mesh[2] = meshlink_open("get_all_nodes_conf.3", "baz", "get-all-nodes", DEV_CLASS_STATIONARY);
@@ -169,7 +169,7 @@ int main(void) {
        meshlink_close(mesh[0]);
        sleep(2);
        time_t foo_stopped = time(NULL);
-       mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "import-export", DEV_CLASS_BACKBONE);
+       mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "get-all_nodes", DEV_CLASS_BACKBONE);
        assert(mesh[0]);
 
        nodes = meshlink_get_all_nodes(mesh[0], nodes, &nnodes);