From 0b663c4f9ae0fc2d6b2d7cda4baff4b00059a52d Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Sun, 30 Sep 2018 16:25:28 +0800 Subject: rsyslog: avoid recompiling program during running ptest * Previously there is below logic in rsyslog-8.37.0/tests/Makefile check-TESTS: After below commit in automake, 8555e7b81 check: Make 'check-TESTS' target depend on test dependencies the logic changes to the below: check-TESTS: $(check_PROGRAMS) It will result in compiling program on target when run ptest on target, but actually there is no need to rebuild the program on target, so change it back to "check-TESTS:" to avoid recompiling. * Update the path of abs_top_builddir to guarantee the test env is correct. Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-oe') diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb index fb151428fd..fbdf2818c1 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb @@ -86,10 +86,14 @@ do_install_ptest() { # do NOT need to rebuild Makefile itself sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + # do NOT need to rebuild $(check_PROGRAMS) + sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile # fix the srcdir, top_srcdir sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + # fix the abs_top_builddir + sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile # valgrind is not compatible with arm and mips, # so remove related test cases if there is no valgrind. -- cgit 1.2.3-korg