From e84f94c95b02f1ab18f0ab09e8cdc9427b00df14 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 8 Aug 2014 15:13:49 +0200 Subject: [PATCH] Make sure the tests compile again. --- test/basic.c | 4 ++-- test/basicpp.cpp | 4 ++-- test/channels.c | 4 ++-- test/import-export.c | 4 ++-- test/invite-join.c | 4 ++-- test/sign-verify.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/basic.c b/test/basic.c index 9b09455a..002c5769 100644 --- a/test/basic.c +++ b/test/basic.c @@ -6,7 +6,7 @@ int main(int argc, char *argv[]) { // Open a new meshlink instance. - meshlink_handle_t *mesh = meshlink_open("basic_conf", "foo"); + meshlink_handle_t *mesh = meshlink_open("basic_conf", "foo", "basic"); if(!mesh) { fprintf(stderr, "Could not initialize configuration for foo\n"); return 1; @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { // Check that the name is ignored now, and that we still are "foo". - mesh = meshlink_open("basic_conf", "bar"); + mesh = meshlink_open("basic_conf", "bar", "basic"); if(!mesh) { fprintf(stderr, "Could not open configuration for foo a second time\n"); return 1; diff --git a/test/basicpp.cpp b/test/basicpp.cpp index 3b8b77f7..e1c10366 100644 --- a/test/basicpp.cpp +++ b/test/basicpp.cpp @@ -8,7 +8,7 @@ using namespace std; int main(int argc, char *argv[]) { // Open a new meshlink instance. - meshlink::mesh *mesh = meshlink::open("basicpp_conf", "foo"); + meshlink::mesh *mesh = meshlink::open("basicpp_conf", "foo", "basicpp"); if(!mesh) { cerr << "Could not initialize configuration for foo\n"; return 1; @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) { // Check that the name is ignored now, and that we still are "foo". - mesh = meshlink::open("basic_conf", "bar"); + mesh = meshlink::open("basic_conf", "bar", "basicpp"); if(!mesh) { cerr << "Could not open configuration for foo a second time\n"; return 1; diff --git a/test/channels.c b/test/channels.c index 8327e8ed..280902cb 100644 --- a/test/channels.c +++ b/test/channels.c @@ -35,13 +35,13 @@ bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_no int main(int argc, char *argv[]) { // Open two new meshlink instance. - meshlink_handle_t *mesh1 = meshlink_open("channels_conf.1", "foo"); + meshlink_handle_t *mesh1 = meshlink_open("channels_conf.1", "foo", "channels"); if(!mesh1) { fprintf(stderr, "Could not initialize configuration for foo\n"); return 1; } - meshlink_handle_t *mesh2 = meshlink_open("channels_conf.2", "bar"); + meshlink_handle_t *mesh2 = meshlink_open("channels_conf.2", "bar", "channels"); if(!mesh2) { fprintf(stderr, "Could not initialize configuration for bar\n"); return 1; diff --git a/test/import-export.c b/test/import-export.c index d6498c24..f2229589 100644 --- a/test/import-export.c +++ b/test/import-export.c @@ -15,13 +15,13 @@ void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) { int main(int argc, char *argv[]) { // Open two new meshlink instance. - meshlink_handle_t *mesh1 = meshlink_open("import_export_conf.1", "foo"); + meshlink_handle_t *mesh1 = meshlink_open("import_export_conf.1", "foo", "import-export"); if(!mesh1) { fprintf(stderr, "Could not initialize configuration for foo\n"); return 1; } - meshlink_handle_t *mesh2 = meshlink_open("import_export_conf.2", "bar"); + meshlink_handle_t *mesh2 = meshlink_open("import_export_conf.2", "bar", "import-export"); if(!mesh2) { fprintf(stderr, "Could not initialize configuration for bar\n"); return 1; diff --git a/test/invite-join.c b/test/invite-join.c index 50b79fb4..a7bee95c 100644 --- a/test/invite-join.c +++ b/test/invite-join.c @@ -15,13 +15,13 @@ void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) { int main(int argc, char *argv[]) { // Open two new meshlink instance. - meshlink_handle_t *mesh1 = meshlink_open("invite_join_conf.1", "foo"); + meshlink_handle_t *mesh1 = meshlink_open("invite_join_conf.1", "foo", "invite-join"); if(!mesh1) { fprintf(stderr, "Could not initialize configuration for foo\n"); return 1; } - meshlink_handle_t *mesh2 = meshlink_open("invite_join_conf.2", "bar"); + meshlink_handle_t *mesh2 = meshlink_open("invite_join_conf.2", "bar", "invite-join"); if(!mesh2) { fprintf(stderr, "Could not initialize configuration for bar\n"); return 1; diff --git a/test/sign-verify.c b/test/sign-verify.c index a7f9a5af..6c7ccfec 100644 --- a/test/sign-verify.c +++ b/test/sign-verify.c @@ -8,13 +8,13 @@ int main(int argc, char *argv[]) { // Open two new meshlink instance. - meshlink_handle_t *mesh1 = meshlink_open("sign_verify_conf.1", "foo"); + meshlink_handle_t *mesh1 = meshlink_open("sign_verify_conf.1", "foo", "sign-verify"); if(!mesh1) { fprintf(stderr, "Could not initialize configuration for foo\n"); return 1; } - meshlink_handle_t *mesh2 = meshlink_open("sign_verify_conf.2", "bar"); + meshlink_handle_t *mesh2 = meshlink_open("sign_verify_conf.2", "bar", "sign-verify"); if(!mesh2) { fprintf(stderr, "Could not initialize configuration for bar\n"); return 1; -- 2.39.5