Adds test coverage with gcov & lcov ++

Makefile.am

@@ -1,5 +1,4 @@
 bin_PROGRAMS = asmsh child
-noinst_LIBRARIES = libcheck_asmsh.a
 
 libcheck_asmsh_a_SOURCES = mmap_parse.c asm_env.c compile.c logger.c
 
@@ -8,8 +7,32 @@ child_SOURCES = child.s
 
 SUBDIRS = 
 if CHECK
+noinst_LIBRARIES = libcheck_asmsh.a
+libcheck_asmsh_a_CFLAGS = @CFLAGS@ -fprofile-arcs -ftest-coverage
 SUBDIRS += tests
+
+LCOV_INFO=lcov.info
+LCOV_HTML=lcov_html
+
+checks: check coverage
+
+coverage: $(LCOV_HTML)
+
+$(LCOV_INFO): gcov
+	lcov --capture --directory . --output-file $@
+
+$(LCOV_HTML): $(LCOV_INFO)
+	genhtml $< --output-directory $@
+
+gcov: *.gcno
+	gcov -j $^
+
+clean-local:
+	-rm -rf *.gcov *.gcda *.gcno $(LCOV_INFO) $(LCOV_HTML)
+
 endif
 
 child$(EXEEXT): $(child_SOURCES:.s=.o)
 	ld $(child_LDFLAGS) -o $@ $<
+
+

child.s

@@ -18,13 +18,13 @@ _start:
 	jle .errmap
 
 	push %rax
-	xor %rax, %rax
-	push %rax
+	#xor %rax, %rax
+	#push %rax
 
 
-	mov $-1, %r15
-	mov $34, %rax # sys_pause
-	syscall
+	#mov $-1, %r15
+	#mov $34, %rax # sys_pause
+	#syscall
 
 	jmp *(%rsp)
 

compile.c

@@ -86,15 +86,7 @@ void asmsh_asmc_ctx_free(asmsh_asmc_ctx_t *ctx)
 				ctx->child.pid = 0;
 			}
 		}
-		if(ctx->child.pid > 0)
-		{
-			if(kill(ctx->child.pid, SIGKILL) == -1)
-			{
-				perror("Unable to kill child process");
-			}
-		}
-		ctx->child.pid = 0;
-		close(ctx->child.pipe_stdin);
+		_child_cleanup(&ctx->child);
 	}
 	if(ctx->respath)
 	{

tests/regen.sh

@@ -14,6 +14,9 @@ SUBDIRS  = samples
 TESTLIB_NAME=libcheck_asmsh.a
 TESTLIB=\$(top_builddir)/\$(TESTLIB_NAME)
 
+clean-local:
+	-rm -rf *.gcov *.gcda *.gcno
+
 \$(TESTLIB):
 	make -C \$(top_builddir) \$(TESTLIB_NAME)
 
@@ -24,7 +27,7 @@ for p in $progs
 do
 	cat << __EOF__ >> Makefile.am
 ${p}_SOURCES = ${p}.c
-${p}_CFLAGS = @CHECK_CFLAGS@
+${p}_CFLAGS = @CHECK_CFLAGS@ -fprofile-arcs -ftest-coverage
 ${p}_LDADD = \$(TESTLIB) @CHECK_LIBS@
 __EOF__
 

tests/samples/procfs_pid_maps_sm

@@ -0,0 +1,2 @@
+00400000-00452000 r-xp 00000000 08:02 173521      /usr/bin/dbus-daemon
+00651000-00652000 r--p 00051000 08:02 173521      /usr/bin/dbus-daemon

tests/tests_asm_env.c

@@ -35,8 +35,23 @@ START_TEST(test_asm_stamps)
 }
 END_TEST
 
+START_TEST(test_env_update)
+{
+	asmsh_env_t *env = asmsh_env("samples/asm_env_stamps");
+
+	ck_assert_ptr_nonnull(env);
+
+	asmsh_env_update_maps(env);
+
+	ck_assert_mem_eq(&stamp1, &(env->regs.r15), 8);
+	ck_assert_mem_eq(&stamp2, &(env->regs.r14), 8);
+
+	asmsh_env_free(env);
+}
+
 ASMSH_CHECK_START("Testing asm env", "testing asm environment")
 	ASMSH_ADD_TEST(test_env);
 	ASMSH_ADD_TEST(test_asm_stamps);
+	ASMSH_ADD_TEST(test_env_update);
 ASMSH_CHECK_END
 

tests/tests_compile.c

@@ -29,6 +29,7 @@ START_TEST(test_syntax_valid)
 END_TEST
 
 static const char *invalid_syntax[] = {
+	"mov %al,\x0A %ah",
 	"mov %rax, %rbx;",
 	"mov %al, %ah\n",
 	"#add 1, %rbx",

tests/tests_logger.c

@@ -52,6 +52,13 @@ START_TEST(test_log_default_fmt)
 }
 END_TEST
 
+START_TEST(test_logger_setup)
+{
+	int ret = asmsh_logger_setup(NULL);
+
+	ck_assert_int_eq(ret, 0);
+}
+END_TEST
 
 START_TEST(test_log_function_lvl_nolog)
 {
@@ -242,6 +249,7 @@ END_TEST
 ASMSH_CHECK_START("logger tests", "unit tests various logger function")
 	ASMSH_ADD_TEST(test_logger_new);
 	ASMSH_ADD_TEST(test_log_default_fmt);
+	ASMSH_ADD_TEST(test_logger_setup);
 	ASMSH_ADD_TEST(test_log_function_lvl_nolog);
 	ASMSH_ADD_LOOP_TEST(test_log_function_lvl_singlelog, 0, msg_samples_sz);
 	ASMSH_ADD_TEST(test_log_function_lvl_logs);

tests/tests_mmap.c

@@ -8,6 +8,7 @@
 #include "mmap_parse.h"
 
 #define PARSE_FD_SAMPLE "samples/procfs_pid_maps"
+#define PARSE_FD_SAMPLE_SM "samples/procfs_pid_maps_sm"
 
 typedef struct {
 	child_mmap_t map;
@@ -75,7 +76,7 @@ START_TEST (test_parse_fd)
 		 ""},
 	};
 
-	bzero(&maps, sizeof(child_mmap_l));
+	child_mmap_init(&maps);
 	fd = open(PARSE_FD_SAMPLE, O_RDONLY);
 	if(fd < 0)
 	{
@@ -91,8 +92,64 @@ START_TEST (test_parse_fd)
 }
 END_TEST
 
+START_TEST(test_mmap_get_invalid)
+{
+	child_mmap_l maps;
+	int ret = child_mmap_get(-1, &maps);
+	ck_assert_int_eq(ret, -1);
+}
+END_TEST
+
+START_TEST(test_mmap_get_self)
+{
+	child_mmap_l maps;
+	pid_t spid = getpid();
+	child_mmap_init(&maps);
+	int ret = child_mmap_get(spid, &maps);
+
+	ck_assert_int_eq(ret, 0);
+
+}
+END_TEST
+
+START_TEST(test_shrink_map)
+{
+	child_mmap_l maps;
+	int ret, fd;
+
+	fd = open(PARSE_FD_SAMPLE, O_RDONLY);
+	if(fd < 0)
+	{
+		perror("Unable to open sample");
+		ck_abort_msg("Unable to open sample");
+	}
+
+	child_mmap_init(&maps);
+	ret = child_mmap_get_fd(fd, &maps);
+
+	ck_assert_int_eq(ret, 0);
+
+	close(fd);
+
+	fd = open(PARSE_FD_SAMPLE_SM, O_RDONLY);
+	if(fd < 0)
+	{
+		perror("Unable to open sample");
+		ck_abort_msg("Unable to open sample");
+	}
+
+	ret = child_mmap_get_fd(fd, &maps);
+
+	ck_assert_int_eq(ret, 0);
+
+	close(fd);
+}
+
 ASMSH_CHECK_START("/proc/[pid]/map file parser", "parsing tests")
 	ASMSH_ADD_TEST(test_parse_line);
 	ASMSH_ADD_TEST(test_parse_fd);
+	ASMSH_ADD_TEST(test_mmap_get_invalid);
+	ASMSH_ADD_TEST(test_mmap_get_self);
+	ASMSH_ADD_TEST(test_shrink_map);
 ASMSH_CHECK_END