logmsg/tests/test_log_message: switch to Criterion

Signed-off-by: László Várady <[email protected]>
grinapo · Aug 24, 2016 · c194692 · c194692
1 parent a113791
commit c194692
Show file tree

Hide file tree

Showing 2 changed files with 158 additions and 193 deletions.
diff --git a/lib/logmsg/tests/Makefile.am b/lib/logmsg/tests/Makefile.am
@@ -1,16 +1,11 @@
 lib_logmsg_tests_TESTS =                       \
- lib/logmsg/tests/test_log_message          \
  lib/logmsg/tests/test_logmsg_serialize     \
  lib/logmsg/tests/test_timestamp_serialize  \
  lib/logmsg/tests/test_tags
 
 
 check_PROGRAMS       += ${lib_logmsg_tests_TESTS}
 
-lib_logmsg_tests_test_log_message_CFLAGS = $(TEST_CFLAGS)  
-lib_logmsg_tests_test_log_message_LDADD   = $(TEST_LDADD)
-
-
 lib_logmsg_tests_test_timestamp_serialize_CFLAGS = $(TEST_CFLAGS)
 lib_logmsg_tests_test_timestamp_serialize_LDADD  = $(TEST_LDADD)
 
@@ -24,12 +19,16 @@ if ENABLE_CRITERION
 
 lib_logmsg_tests_TESTS +=				\
 	lib/logmsg/tests/test_nvtable			\
-	lib/logmsg/tests/test_gsockaddr_serialize
+	lib/logmsg/tests/test_gsockaddr_serialize	\
+	lib/logmsg/tests/test_log_message
 
 lib_logmsg_tests_test_nvtable_CFLAGS			= $(TEST_CFLAGS)
 lib_logmsg_tests_test_nvtable_LDADD			= $(TEST_LDADD)
 
 lib_logmsg_tests_test_gsockaddr_serialize_CFLAGS	= $(TEST_CFLAGS)
 lib_logmsg_tests_test_gsockaddr_serialize_LDADD		= $(TEST_LDADD)
 
+lib_logmsg_tests_test_log_message_CFLAGS		= $(TEST_CFLAGS)
+lib_logmsg_tests_test_log_message_LDADD			= $(TEST_LDADD)
+
 endif