Merge "Merge branch 'upstream' into tizen" into tizen

[platform/upstream/cryptsetup.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5a7e21d..4688bff 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,7 +25,7 @@ TESTS += verity-compat-test
 endif
 
 if REENCRYPT
-TESTS += reencryption-compat-test reencryption-compat-test2 luks2-reencryption-test
+TESTS += reencryption-compat-test reencryption-compat-test2 luks2-reencryption-test luks2-reencryption-mangle-test
 endif
 
 if INTEGRITYSETUP
@@ -57,6 +57,7 @@ EXTRA_DIST = compatimage.img.xz compatv10image.img.xz \
        reencryption-compat-test \
        reencryption-compat-test2 \
        luks2-reencryption-test \
+       luks2-reencryption-mangle-test \
        tcrypt-compat-test \
        luks1-compat-test \
        luks2-validation-test generators \
@@ -76,6 +77,8 @@ CLEANFILES = cryptsetup-tst* valglog* *-fail-*.log
 clean-local:
        -rm -rf tcrypt-images luks1-images luks2-images bitlk-images conversion_imgs luks2_valid_hdr.img blkid-luks2-pv-img blkid-luks2-pv-img.bcp
 
+LDADD = $(LTLIBINTL)
+
 differ_SOURCES = differ.c
 differ_CFLAGS = $(AM_CFLAGS) -Wall -O2
 
@@ -112,6 +115,7 @@ compatimage.img:
        @xz -k -d compatimage.img.xz
 
 valgrind-check: api-test api-test-2 differ
+       @VALG=1 ./compat-test
        @VALG=1 ./compat-test2
        @VALG=1 ./luks2-validation-test
        @VALG=1 ./verity-compat-test
@@ -119,6 +123,8 @@ valgrind-check: api-test api-test-2 differ
        @INFOSTRING="api-test-000" ./valg-api.sh ./api-test
        @INFOSTRING="api-test-002" ./valg-api.sh ./api-test-2
        @VALG=1 ./luks2-reencryption-test
-       @VALG=1 ./compat-test
+       @VALG=1 ./luks2-reencryption-mangle-test
+       @VALG=1 ./bitlk-compat-test
+       @grep -l "ERROR SUMMARY: [^0] errors" valglog* || echo "No leaks detected."
 
 .PHONY: valgrind-check