From 96356187b86a9c3116e7cc67c64be4c43540de09 Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Tue, 14 Aug 2012 15:42:20 +0200 Subject: [PATCH 1/2] [rt25901_atf] common/tests/Makefile.am improvements make check no longer tries to run atf when ATF was not enabled (make check target does not make much sense with tests disabled, but it shouldn't fail complaining about missing atf-run) --- common/tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am index a389c413..85808271 100644 --- a/common/tests/Makefile.am +++ b/common/tests/Makefile.am @@ -14,9 +14,9 @@ alloc_unittest_LDADD += ../libdhcp.a \ ../../omapip/libomapi.a ../../bind/lib/libdns.a \ ../../bind/lib/libisc.a -endif - check: $(ATF_TESTS) atf-run | atf-report +endif + check_PROGRAMS = $(ATF_TESTS) From 3c753d22f8b72bbf81769f94553d18d3cd63dd88 Mon Sep 17 00:00:00 2001 From: Tomasz Mrugalski Date: Tue, 14 Aug 2012 13:44:54 +0000 Subject: [PATCH 2/2] [rt25901_atf] common/tests/Makefile.in regenerated --- common/tests/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in index afba2024..78cadfc7 100644 --- a/common/tests/Makefile.in +++ b/common/tests/Makefile.in @@ -528,8 +528,8 @@ uninstall-am: tags tags-recursive uninstall uninstall-am -check: $(ATF_TESTS) - atf-run | atf-report +@HAVE_ATF_TRUE@check: $(ATF_TESTS) +@HAVE_ATF_TRUE@ atf-run | atf-report # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: