Merge pull request #192 from ngtcp2/include-path-munit

Add include path to munit directory
ngtcp2 · Feb 4, 2024 · 970f29d · 970f29d
2 parents 67929ad + 6dd029b
commit 970f29d
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 15 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -26,6 +26,7 @@
 include_directories(
   "${CMAKE_SOURCE_DIR}/lib"
   "${CMAKE_SOURCE_DIR}/lib/includes"
+  "${CMAKE_SOURCE_DIR}/tests/munit"
   "${CMAKE_BINARY_DIR}/lib/includes"
 )
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -55,6 +55,7 @@ main_LDFLAGS = -static
 AM_CFLAGS = $(WARNCFLAGS) \
 	-I${top_srcdir}/lib \
 	-I${top_srcdir}/lib/includes \
+	-I${top_srcdir}/tests/munit \
 	-I${top_builddir}/lib/includes \
 	-DBUILDING_NGHTTP3 \
 	@DEFS@

diff --git a/tests/main.c b/tests/main.c
@@ -28,7 +28,7 @@
 #  include <config.h>
 #endif /* HAVE_CONFIG_H */
 
-#include "munit/munit.h"
+#include "munit.h"
 
 /* include test cases' include files here */
 #include "nghttp3_qpack_test.h"

diff --git a/tests/nghttp3_conn_test.c b/tests/nghttp3_conn_test.c
@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "munit/munit.h"
-
 #include "nghttp3_conn.h"
 #include "nghttp3_macro.h"
 #include "nghttp3_conv.h"

diff --git a/tests/nghttp3_conn_test.h b/tests/nghttp3_conn_test.h
@@ -31,7 +31,7 @@
 
 #define MUNIT_ENABLE_ASSERT_ALIASES
 
-#include "munit/munit.h"
+#include "munit.h"
 
 extern const MunitSuite conn_suite;
 

diff --git a/tests/nghttp3_conv_test.c b/tests/nghttp3_conv_test.c
@@ -27,7 +27,5 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "munit/munit.h"
-
 #include "nghttp3_conv.h"
 #include "nghttp3_test_helper.h"
diff --git a/tests/nghttp3_http_test.c b/tests/nghttp3_http_test.c
@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "munit/munit.h"
-
 #include "nghttp3_http.h"
 #include "nghttp3_macro.h"
 #include "nghttp3_test_helper.h"

diff --git a/tests/nghttp3_http_test.h b/tests/nghttp3_http_test.h
@@ -31,7 +31,7 @@
 
 #define MUNIT_ENABLE_ASSERT_ALIASES
 
-#include "munit/munit.h"
+#include "munit.h"
 
 extern const MunitSuite http_suite;
 

diff --git a/tests/nghttp3_qpack_test.c b/tests/nghttp3_qpack_test.c
@@ -27,8 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "munit/munit.h"
-
 #include "nghttp3_qpack.h"
 #include "nghttp3_macro.h"
 #include "nghttp3_test_helper.h"

diff --git a/tests/nghttp3_qpack_test.h b/tests/nghttp3_qpack_test.h
@@ -31,7 +31,7 @@
 
 #define MUNIT_ENABLE_ASSERT_ALIASES
 
-#include "munit/munit.h"
+#include "munit.h"
 
 extern const MunitSuite qpack_suite;
 

diff --git a/tests/nghttp3_tnode_test.c b/tests/nghttp3_tnode_test.c
@@ -26,8 +26,6 @@
 
 #include <stdio.h>
 
-#include "munit/munit.h"
-
 #include "nghttp3_tnode.h"
 #include "nghttp3_macro.h"
 #include "nghttp3_test_helper.h"

diff --git a/tests/nghttp3_tnode_test.h b/tests/nghttp3_tnode_test.h
@@ -31,7 +31,7 @@
 
 #define MUNIT_ENABLE_ASSERT_ALIASES
 
-#include "munit/munit.h"
+#include "munit.h"
 
 extern const MunitSuite tnode_suite;