From 4a232d23a8f51bebf9ee382e480248b4bde30f28 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Fri, 30 Sep 2016 16:22:40 +0200 Subject: build,w32: Unconditionally build tests. * configure.ac (run_tests, RUN_TESTS, RUN_GPG_TESTS): Remove variables. They are misleadingly named, as they inhibit building the tests. There is no reason not to build the tests even when cross-compiling, as they are only run if one does 'make check'. * Makefile: Adapt accordingly. * tests/Makefile.am: Adapt accordingly. Avoid building 'asschk' on Windows as it uses non-portable functions. Signed-off-by: Justus Winter --- tests/Makefile.am | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index d72f51e8b..6ede0d409 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,14 +18,7 @@ ## Process this file with automake to produce Makefile.in - -if RUN_GPG_TESTS -openpgp = openpgp -else -openpgp = -endif - -SUBDIRS = gpgscm ${openpgp} . migrations pkits +SUBDIRS = gpgscm openpgp migrations pkits . GPGSM = ../sm/gpgsm @@ -66,7 +59,9 @@ CLEANFILES = inittests.stamp x y y z out err \ DISTCLEANFILES = pubring.kbx~ random_seed +if !HAVE_W32_SYSTEM noinst_PROGRAMS = asschk +endif asschk_SOURCES = asschk.c -- cgit v1.2.3