Browse Source

new target check-mem, resolves #32

Leon Urbas 11 years ago
parent
commit
afa840a798
3 changed files with 33 additions and 8 deletions
  1. 10 5
      tests/Makefile.am
  2. 3 3
      tests/check_encode.c
  3. 20 0
      tests/suppressions

+ 10 - 5
tests/Makefile.am

@@ -1,17 +1,22 @@
-TESTS = check_stack check_list check_indexedList check_generated check_namespace check_encode check_decode check_create check_delete
 TESTS_ENVIRONMENT=
+TESTS=
+UNIT_TESTS=
+check_PROGRAMS=
 
-TESTS_ENVIRONMENT_MEM="libtool --mode=execute valgrind --leak-check=full"
+UNIT_TESTS += check_stack check_list check_indexedList check_generated check_namespace check_encode check_decode check_create check_delete
+TESTS += $(UNIT_TESTS)
+check_PROGRAMS += $(UNIT_TESTS)
+
+TESTS_ENVIRONMENT_MEM="libtool --mode=execute valgrind --leak-check=full --quiet --suppressions=suppressions --gen-suppressions=no --error-exitcode=666"
 
 .PHONY: check-mem
 check-mem:
-	$(MAKE) $(AM_MAKEFLAGS) check TESTS=$(TESTS) TESTS_ENVIRONMENT=$(TESTS_ENVIRONMENT_MEM)
-	
+	$(MAKE) $(AM_MAKEFLAGS) check TESTS="$(UNIT_TESTS)" TESTS_ENVIRONMENT=$(TESTS_ENVIRONMENT_MEM)
+		
 # --- no changes beyond this line needed ---
 INCLUDE = @CHECK_CFLAGS@ -I$(top_builddir)/src -I$(top_builddir)/include
 LDADD = $(top_builddir)/lib/libopen62541.a @CHECK_LIBS@
 
-check_PROGRAMS = $(TESTS)
 AM_LDFLAGS = $(LDADD)  --coverage
 
 AM_CFLAGS = $(GLOBAL_AM_CFLAGS) $(INCLUDE) --coverage

+ 3 - 3
tests/check_encode.c

@@ -119,7 +119,7 @@ START_TEST(encodeUInt64_test)
 	UA_UInt64 value = 0x0101FF00FF00FF00;
 	//EncodeUInt16
 
-	rawMessage.data = (UA_Byte*) malloc(sizeof(UA_UInt32));
+	rawMessage.data = (UA_Byte*) malloc(sizeof(UA_UInt64));
 
 	rawMessage.length = 8;
 
@@ -145,7 +145,7 @@ START_TEST(encodeInt64_test)
 	UA_UInt64 value = 0x0101FF00FF00FF00;
 	//EncodeUInt16
 
-	rawMessage.data = (UA_Byte*) malloc(sizeof(UA_UInt32));
+	rawMessage.data = (UA_Byte*) malloc(sizeof(UA_UInt64));
 
 	rawMessage.length = 8;
 
@@ -206,7 +206,7 @@ START_TEST(encodeUAString_test)
 	ck_assert_int_eq(dstBuf[0],11);
 	ck_assert_int_eq(dstBuf[0+sizeof(UA_Int32)],'A');
 
-
+	free(dstBuf);
 }
 END_TEST
 START_TEST(encodeDataValue_test)

+ 20 - 0
tests/suppressions

@@ -0,0 +1,20 @@
+{
+   TimerCreateParam1
+   Memcheck:Param
+   timer_create(evp)
+   fun:timer_create
+   fun:check_get_clockid
+   fun:srunner_run
+   fun:srunner_run_all
+   fun:(below main)
+}
+{
+   TimerCreateParam2
+   Memcheck:Param
+   timer_create(evp)
+   fun:timer_create
+   fun:srunner_run
+   fun:srunner_run_all
+   fun:(below main)
+}
+