Merge pull request #4566 from elliefm/v39/cunit-under-valgrind-should…

…-fail-if-mem-errors

make 'check' etc fail on cunit valgrind errors

Makefile.am

@@ -702,7 +702,11 @@ cunit/registers.h: $(CUNIT_PROJECT)
 	$(AM_V_GEN)$(CUNIT_PL) --generate-register-function $@
 
 # To run under Valgrind, do: make VG=1 check
-VALGRIND = libtool --mode=execute valgrind --tool=memcheck --leak-check=full --suppressions=vg.supp
+VALGRIND = libtool --mode=execute valgrind \
+            --tool=memcheck \
+            --leak-check=full \
+            --suppressions=vg.supp \
+            --error-exitcode=75
 
 check-local:
 	@echo "Running unit tests"
@@ -729,7 +733,7 @@ check-local:
 check-discrete: cunit/unit
 	@echo "Running unit tests, one at a time"
 	@vg= ; \
-		test -z "$$VG" || vg="$(VALGRIND) --quiet --error-exitcode=75 --log-fd=3" ; \
+		test -z "$$VG" || vg="$(VALGRIND) --quiet --log-fd=3" ; \
 		cd cunit ; \
 		fails=0 ; \
 		tests=0 ; \

cunit/annotate.testc

@@ -2151,6 +2151,8 @@ static void test_canon_value(void)
         ealist = NULL;
     }
 
+    buf_free(&val);
+
     annotate_state_abort(&astate);
     mailbox_close(&mailbox);
     annotatemore_close();

cunit/strarray.testc

@@ -1726,6 +1726,8 @@ static void test_appendv(void)
     s = strarray_appendv(&sa, "ipsum");
     CU_ASSERT_PTR_EQUAL(s, strarray_nth(&sa, 1));
     CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+
+    strarray_fini(&sa);
 }
 
 static void test_addv(void)
@@ -1744,6 +1746,8 @@ static void test_addv(void)
     s = strarray_addv(&sa, "lorem");
     CU_ASSERT_PTR_EQUAL(s, strarray_nth(&sa, 0));
     CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+
+    strarray_fini(&sa);
 }
 
 static void test_add_casev(void)
@@ -1762,6 +1766,8 @@ static void test_add_casev(void)
     s = strarray_add_casev(&sa, "lOREm");
     CU_ASSERT_PTR_EQUAL(s, strarray_nth(&sa, 0));
     CU_ASSERT_EQUAL(strarray_size(&sa), 2);
+
+    strarray_fini(&sa);
 }
 
 /* vim: set ft=c: */