build: Delay compilation of test-related stuff

diff --git a/Makefile.am b/Makefile.am
index bcbd049be36ebaa22d0378a719847d23ecf1df32..94d1bea6c6d01ca6eef0add81c4a014b641c6611 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,9 @@ AM_CPPFLAGS = \
 
 bin_PROGRAMS =
 private_PROGRAMS =
-check_PROGRAMS =
-check_SCRIPTS =
+check_PROGRAMS = $(c_tests)
+check_SCRIPTS = $(sh_tests)
+check_LTLIBRARIES =
 
 CLEANFILES =
 
@@ -32,7 +33,9 @@ noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 noinst_SCRIPTS =
 
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+c_tests =
+sh_tests =
+TESTS = $(c_tests) $(sh_tests)
 
 moduledir = $(p11_module_path)
 module_LTLIBRARIES =

diff --git a/common/Makefile.am b/common/Makefile.am
index daa6fa21a04e9260175379f5a4f75915a95249c1..d5af0292f6a065bff5cafe6cefbbacee780ea807 100644 (file)
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -7,10 +7,13 @@ inc_HEADERS += \
 noinst_LTLIBRARIES += \
        libp11-common.la \
        libp11-library.la \
-       libp11-test.la \
        libp11-tool.la \
        $(NULL)
 
+check_LTLIBRARIES += \
+       libp11-test.la \
+       $(NULL)
+
 libp11_common_la_SOURCES = \
        common/argv.c common/argv.h \
        common/attrs.c common/attrs.h \
@@ -54,7 +57,7 @@ common_LIBS = \
        libp11-common.la \
        $(NULL)
 
-check_PROGRAMS += \
+c_tests += \
        test-tests \
        test-compat \
        test-hash \
@@ -109,7 +112,7 @@ test_tests_LDADD = $(common_LIBS)
 test_url_SOURCES = common/test-url.c
 test_url_LDADD = $(common_LIBS)
 
-noinst_PROGRAMS += \
+check_PROGRAMS += \
        frob-getauxval \
        frob-getenv \
        $(NULL)

diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 434c257e320aa503785b5f48e0fd1a5fade80f94..303fe0605f0ff72b73069eda850c9d556201b67e 100644 (file)
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -66,6 +66,9 @@ libp11_kit_la_LIBADD = \
 
 noinst_LTLIBRARIES += \
        libp11-kit-internal.la \
+       $(NULL)
+
+check_LTLIBRARIES += \
        libp11-kit-testable.la \
        $(NULL)
 
@@ -194,7 +197,7 @@ p11_kit_LIBS = \
        libp11-common.la \
        $(LTLIBINTL)
 
-check_PROGRAMS += \
+c_tests += \
        test-progname \
        test-util \
        test-conf \
@@ -209,7 +212,7 @@ check_PROGRAMS += \
        $(NULL)
 
 if !OS_WIN32
-check_SCRIPTS += p11-kit/test-server.sh
+sh_tests += p11-kit/test-server.sh
 endif
 
 test_conf_SOURCES = p11-kit/test-conf.c
@@ -245,7 +248,7 @@ test_uri_LDADD = $(p11_kit_LIBS)
 test_util_SOURCES = p11-kit/test-util.c
 test_util_LDADD = $(p11_kit_LIBS)
 
-noinst_PROGRAMS += \
+check_PROGRAMS += \
        print-messages \
        frob-setuid
 
@@ -255,7 +258,7 @@ print_messages_LDADD = $(p11_kit_LIBS)
 frob_setuid_SOURCES = p11-kit/frob-setuid.c
 frob_setuid_LDADD = $(p11_kit_LIBS)
 
-check_PROGRAMS += \
+c_tests += \
        test-virtual \
        test-managed \
        test-log \
@@ -278,7 +281,7 @@ test_transport_LDADD = $(p11_kit_LIBS)
 test_virtual_SOURCES = p11-kit/test-virtual.c
 test_virtual_LDADD = $(p11_kit_LIBS)
 
-noinst_LTLIBRARIES += \
+check_LTLIBRARIES += \
        mock-one.la \
        mock-two.la \
        mock-three.la \
@@ -317,5 +320,5 @@ endif
 EXTRA_DIST += \
        p11-kit/fixtures \
        p11-kit/test-mock.c \
-       $(check_SCRIPTS) \
+       p11-kit/test-server.sh \
        $(NULL)

diff --git a/trust/Makefile.am b/trust/Makefile.am
index ba9c738e24e0c03994295833952b4a83307edca6..59df75145923924fc675849cd789eabf42a4ddac 100644 (file)
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -1,7 +1,11 @@
 
 noinst_LTLIBRARIES += \
+       libtrust-data.la \
+       $(NULL)
+
+check_LTLIBRARIES += \
        libtrust-testable.la \
-       libtrust-data.la
+       $(NULL)
 
 libtrust_data_la_SOURCES = \
        trust/asn1.c trust/asn1.h \
@@ -136,7 +140,7 @@ trust_LIBS = \
        $(HASH_LIBS) \
        $(NULL)
 
-noinst_LTLIBRARIES += \
+check_LTLIBRARIES += \
        libtrust-test.la
 
 libtrust_test_la_SOURCES = \
@@ -144,7 +148,7 @@ libtrust_test_la_SOURCES = \
        trust/digest.c \
        $(NULL)
 
-check_PROGRAMS += \
+c_tests += \
        test-digest \
        test-asn1 \
        test-base64 \
@@ -233,7 +237,7 @@ test_x509_SOURCES = trust/test-x509.c
 test_x509_LDADD = $(trust_LIBS)
 test_x509_CFLAGS = $(trust_CFLAGS)
 
-noinst_PROGRAMS += \
+check_PROGRAMS += \
        frob-pow \
        frob-token \
        frob-nss-trust \