From 350bd148d3181c564eeb884dadc37aaed7d3fb9b Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 29 May 2017 15:06:04 +0200 Subject: build: Delay building test programs until "make check" This is to disable clang-analyzer against test programs, which can contain several false-positives. --- Makefile.am | 7 +++---- common/Makefile.am | 2 +- p11-kit/Makefile.am | 4 ++-- trust/Makefile.am | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2df3cc7..b5e1136 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,8 +16,7 @@ AM_CPPFLAGS = \ bin_PROGRAMS = private_PROGRAMS = - -CHECK_PROGS = +check_PROGRAMS = CLEANFILES = @@ -29,10 +28,10 @@ inc_HEADERS = lib_LTLIBRARIES = noinst_LTLIBRARIES = -noinst_PROGRAMS = $(CHECK_PROGS) +noinst_PROGRAMS = noinst_SCRIPTS = -TESTS = $(CHECK_PROGS) +TESTS = $(check_PROGRAMS) moduledir = $(p11_module_path) module_LTLIBRARIES = diff --git a/common/Makefile.am b/common/Makefile.am index 54d3f4e..daa6fa2 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -54,7 +54,7 @@ common_LIBS = \ libp11-common.la \ $(NULL) -CHECK_PROGS += \ +check_PROGRAMS += \ test-tests \ test-compat \ test-hash \ diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am index 687223e..f2571d2 100644 --- a/p11-kit/Makefile.am +++ b/p11-kit/Makefile.am @@ -194,7 +194,7 @@ p11_kit_LIBS = \ libp11-common.la \ $(LTLIBINTL) -CHECK_PROGS += \ +check_PROGRAMS += \ test-progname \ test-util \ test-conf \ @@ -251,7 +251,7 @@ print_messages_LDADD = $(p11_kit_LIBS) frob_setuid_SOURCES = p11-kit/frob-setuid.c frob_setuid_LDADD = $(p11_kit_LIBS) -CHECK_PROGS += \ +check_PROGRAMS += \ test-virtual \ test-managed \ test-log \ diff --git a/trust/Makefile.am b/trust/Makefile.am index 2ae62d4..ba9c738 100644 --- a/trust/Makefile.am +++ b/trust/Makefile.am @@ -144,7 +144,7 @@ libtrust_test_la_SOURCES = \ trust/digest.c \ $(NULL) -CHECK_PROGS += \ +check_PROGRAMS += \ test-digest \ test-asn1 \ test-base64 \ -- cgit v1.1