The tests now all print proper error messages.

diff --git a/test/basic.c b/test/basic.c
index b373581dae76145f621b25bedf1c236caa7d1418..9b09455afb8c0c6e145c5ded0dc14039271d989f 100644 (file)
--- a/test/basic.c
+++ b/test/basic.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <string.h>
 
 #include "meshlink.h"
@@ -6,27 +7,37 @@ int main(int argc, char *argv[]) {
        // Open a new meshlink instance.
 
        meshlink_handle_t *mesh = meshlink_open("basic_conf", "foo");
-       if(!mesh)
+       if(!mesh) {
+               fprintf(stderr, "Could not initialize configuration for foo\n");
                return 1;
+       }
 
        // Check that our own node exists.
 
        meshlink_node_t *self = meshlink_get_node(mesh, "foo");
-       if(!self)
+       if(!self) {
+               fprintf(stderr, "Foo does not know about itself\n");
                return 1;
-       if(strcmp(self->name, "foo"))
+       }
+       if(strcmp(self->name, "foo")) {
+               fprintf(stderr, "Foo thinks its name is %s\n", self->name);
                return 1;
+       }
 
        // Start and stop the mesh.
 
-       if(!meshlink_start(mesh))
+       if(!meshlink_start(mesh)) {
+               fprintf(stderr, "Foo could not start\n");
                return 1;
+       }
        meshlink_stop(mesh);
 
        // Make sure we can start and stop the mesh again.
 
-       if(!meshlink_start(mesh))
+       if(!meshlink_start(mesh)) {
+               fprintf(stderr, "Foo could not start twice\n");
                return 1;
+       }
        meshlink_stop(mesh);
 
        // Close the mesh and open it again, now with a different name parameter.
@@ -36,22 +47,32 @@ 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");
-       if(!mesh)
+       if(!mesh) {
+               fprintf(stderr, "Could not open configuration for foo a second time\n");
                return 1;
+       }
 
-       if(meshlink_get_node(mesh, "bar"))
+       if(meshlink_get_node(mesh, "bar")) {
+               fprintf(stderr, "Foo knows about bar, it shouldn't\n");
                return 1;
+       }
 
        self = meshlink_get_node(mesh, "foo");
-       if(!self)
+       if(!self) {
+               fprintf(stderr, "Foo doesn't know about itself the second time\n");
                return 1;
-       if(strcmp(self->name, "foo"))
+       }
+       if(strcmp(self->name, "foo")) {
+               fprintf(stderr, "Foo thinks its name is %s the second time\n", self->name);
                return 1;
+       }
 
        // Start and stop the mesh.
 
-       if(!meshlink_start(mesh))
+       if(!meshlink_start(mesh)) {
+               fprintf(stderr, "Foo could not start a third time\n");
                return 1;
+       }
        meshlink_stop(mesh);
 
        // That's it.

diff --git a/test/import-export.c b/test/import-export.c
index f7ecf52162dd48d913cf78dd88b987b27b228267..17beaaf0ea8e6a665088cb4de36baf8956d22ecd 100644 (file)
--- a/test/import-export.c
+++ b/test/import-export.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -15,12 +16,16 @@ int main(int argc, char *argv[]) {
        // Open two new meshlink instance.
 
        meshlink_handle_t *mesh1 = meshlink_open("import_export_conf.1", "foo");
-       if(!mesh1)
+       if(!mesh1) {
+               fprintf(stderr, "Could not initialize configuration for foo\n");
                return 1;
+       }
 
        meshlink_handle_t *mesh2 = meshlink_open("import_export_conf.2", "bar");
-       if(!mesh2)
+       if(!mesh2) {
+               fprintf(stderr, "Could not initialize configuration for bar\n");
                return 1;
+       }
 
        // Import and export both side's data
 
@@ -28,16 +33,29 @@ int main(int argc, char *argv[]) {
        meshlink_add_address(mesh2, "localhost");
 
        char *data = meshlink_export(mesh1);
+       if(!data) {
+               fprintf(stderr, "Foo could not export its configuration\n");
+               return 1;
+       }
 
-       if(!meshlink_import(mesh2, data))
+       if(!meshlink_import(mesh2, data)) {
+               fprintf(stderr, "Bar could not import foo's configuration\n");
                return 1;
+       }
 
        free(data);
 
        data = meshlink_export(mesh2);
+       if(!data) {
+               fprintf(stderr, "Bar could not export its configuration\n");
+               return 1;
+       }
+
 
-       if(!meshlink_import(mesh1, data))
+       if(!meshlink_import(mesh1, data)) {
+               fprintf(stderr, "Foo could not import bar's configuration\n");
                return 1;
+       }
 
        free(data);
 
@@ -45,11 +63,15 @@ int main(int argc, char *argv[]) {
 
        meshlink_set_node_status_cb(mesh1, status_cb);
        
-       if(!meshlink_start(mesh1))
+       if(!meshlink_start(mesh1)) {
+               fprintf(stderr, "Foo could not start\n");
                return 1;
+       }
 
-       if(!meshlink_start(mesh2))
+       if(!meshlink_start(mesh2)) {
+               fprintf(stderr, "Bar could not start\n");
                return 1;
+       }
 
        // Wait for the two to connect.
 
@@ -59,8 +81,10 @@ int main(int argc, char *argv[]) {
                        break;
        }
 
-       if(!bar_reachable)
+       if(!bar_reachable) {
+               fprintf(stderr, "Bar not reachable for foo after 20 seconds\n");
                return 1;
+       }
 
        // Clean up.
 

diff --git a/test/invite-join.c b/test/invite-join.c
index bf3800e39ea4ffdbc86080f8aa11f7a1d1c40ba6..4471091c2635c15162a514fa4940c71cbf5b6c02 100644 (file)
--- a/test/invite-join.c
+++ b/test/invite-join.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -15,45 +16,59 @@ int main(int argc, char *argv[]) {
        // Open two new meshlink instance.
 
        meshlink_handle_t *mesh1 = meshlink_open("invite_join_conf.1", "foo");
-       if(!mesh1)
+       if(!mesh1) {
+               fprintf(stderr, "Could not initialize configuration for foo\n");
                return 1;
+       }
 
        meshlink_handle_t *mesh2 = meshlink_open("invite_join_conf.2", "bar");
-       if(!mesh2)
+       if(!mesh2) {
+               fprintf(stderr, "Could not initialize configuration for bar\n");
                return 1;
+       }
 
        // Start the first instance and have it generate an invitation.
 
        meshlink_set_node_status_cb(mesh1, status_cb);
        
-       if(!meshlink_start(mesh1))
+       if(!meshlink_start(mesh1)) {
+               fprintf(stderr, "Foo could not start\n");
                return 1;
+       }
 
        meshlink_add_address(mesh1, "localhost");
        char *url = meshlink_invite(mesh1, "baz");
-       if(!url)
+       if(!url) {
+               fprintf(stderr, "Foo could not generate an invitation for baz\n");
                return 1;
+       }
 
        // Have the second instance join the first.
 
-       if(!meshlink_join(mesh2, url))
+       if(!meshlink_join(mesh2, url)) {
+               fprintf(stderr, "Baz could not join foo's mesh\n");
                return 1;
+       }
 
        free(url);
 
-       if(!meshlink_start(mesh2))
+       if(!meshlink_start(mesh2)) {
+               fprintf(stderr, "Baz could not start\n");
                return 1;
+       }
 
        // Wait for the two to connect.
 
-       for(int i = 0; i < 20; i++) {
+       for(int i = 0; i < 60; i++) {
                sleep(1);
                if(baz_reachable)
                        break;
        }
 
-       if(!baz_reachable)
+       if(!baz_reachable) {
+               fprintf(stderr, "Baz not reachable for foo after 20 seconds\n");
                return 1;
+       }
 
        // Clean up.