Refactor the non-blackbox test suite.

[meshlink] / test / utils.h

diff --git a/test/utils.h b/test/utils.h
index 488721dd37af86748e9642879cad1da8588725d9..bce2f9a5cc1e1a37fbca7b8d85292ad73e6f6c76 100644 (file)
--- a/test/utils.h
+++ b/test/utils.h
@@ -10,7 +10,8 @@ struct sync_flag {
        bool flag;
 };
 
-extern void set_sync_flag(struct sync_flag *s);
+extern void set_sync_flag(struct sync_flag *s, bool value);
+extern bool check_sync_flag(struct sync_flag *s);
 extern bool wait_sync_flag(struct sync_flag *s, int seconds);
 
 /// Create a pair of meshlink instances that are already joined together.
@@ -23,16 +24,23 @@ extern void start_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b);
 extern void stop_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b);
 
 /// Stop and cleanup a pair of meshlink instances.
-extern void close_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b, const char *prefix);
-
-#define assert_after(cond, timeout) do {\
-       for(int i = 0; i++ <= timeout;) {\
-               if(cond)\
-                       break;\
-               if(i == timeout)\
-                       assert(cond);\
-               sleep(1);\
-       }\
-} while(0);
+extern void close_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b);
+
+/// Link two meshlink instances.
+extern void link_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b);
+
+/// Default log callback
+extern void log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *text);
+
+#define assert_after(cond, timeout)\
+       do {\
+               for(int i = 0; i++ <= timeout;) {\
+                       if(cond)\
+                               break;\
+                       if(i == timeout)\
+                               assert(cond);\
+                       sleep(1);\
+               }\
+       } while(0)
 
 #endif