From ab0b00a2396348471dae850d306a756951820adc Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 9 Jul 2016 14:35:06 +1000 Subject: [PATCH] build-sys: Re vert noinst and check programs Previously there was a commit to change all noinst_PROGRAMS into check_PROGRAMS. This was not a good idea. check_PROGRAMS are built before TESTS are run. However they are NOT build before the dejagnu tests are run, causing those tests to fail. So: If the program is required for dejagnu, it needs to go into noinst_PROGRAMS If the program is required for TESTS or is one of those TESTS, it needs to go into check_PROGRAMS --- Makefile.am | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2adba82a..f2ff1e2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -226,18 +226,17 @@ ps_pscommand_SOURCES = \ ps/stacktrace.c \ lib/fileutils.c -TESTS = lib/test_strtod_nol +# Test programs not used by dejagnu but run directly +TESTS = \ + lib/test_strtod_nol +check_PROGRAMS = $(TESTS) -# Note sure why this is needed but it breaks without it -check: $(check_PROGRAMS) - -# lib/test_* binaries -check_PROGRAMS = \ +# Test programs required for dejagnu +noinst_PROGRAMS = \ lib/test_strutils \ lib/test_fileutils \ lib/test_nsutils \ - lib/test_process \ - $(TESTS) + lib/test_process lib_test_strutils_SOURCES = lib/test_strutils.c lib/strutils.c lib_test_strutils_LDADD = $(CYGWINFLAGS)