Always define NS_MODULE and NS_SUBMODULE when NS is used.

When these macros aren't defined, the expansions of the NS macros
can get particularly ugly.

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 3a7ba4292edeeaa6e35c48c5f6c4e76bef092be9..7065012cf1fa3ce1c9685b68a755408cc4c24e1c 100644 (file)
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -95,6 +95,7 @@
 #endif
 
 #define NS_MODULE dir
+#define NS_SUBMODULE tests
 
 static networkstatus_t *
 networkstatus_parse_vote_from_string_(const char *s,

diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index 49034fd32cf23bc9714887efc1e6191c9944977f..cf8711272ba565f80bfa8dd807e951a4d4add7c0 100644 (file)
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -65,6 +65,7 @@ ENABLE_GCC_WARNING("-Woverlength-strings")
 #endif
 
 #define NS_MODULE dir_handle_get
+#define NS_SUBMODULE tests
 
 #define NOT_FOUND "HTTP/1.0 404 Not found\r\n\r\n"
 #define BAD_REQUEST "HTTP/1.0 400 Bad request\r\n\r\n"

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 4877827aefd98822c4f9b3eb91dcf4bfeb4f1e50..a363eca6703ff945c6df582c08b93015bdb2f85b 100644 (file)
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -35,7 +35,8 @@
 #include <sys/param.h>
 #endif
 
-#define NS_MODULE test_options
+#define NS_MODULE opt
+#define NS_SUBMODULE tests
 
 typedef struct {
   int severity;

diff --git a/src/test/test_router.c b/src/test/test_router.c
index 79f56eed079cfff30a61dd292dbd72f2354878f0..a1ea2967ff332a41a50c18acc52a483414c46789 100644 (file)
--- a/src/test/test_router.c
+++ b/src/test/test_router.c
@@ -31,6 +31,9 @@
 #include "test/test.h"
 #include "test/log_test_helpers.h"
 
+#define NS_MODULE rtr
+#define NS_SUBMODULE tests
+
 NS_DECL(const routerinfo_t *, router_get_my_routerinfo, (void));
 
 static routerinfo_t* mock_routerinfo;