[oe-commits] [meta-openembedded] 02/03: rsyslog: avoid recompiling program during running ptest

git at git.openembedded.org git at git.openembedded.org
Mon Oct 1 05:22:19 UTC 2018


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 0b663c4f9ae0fc2d6b2d7cda4baff4b00059a52d
Author: Mingli Yu <Mingli.Yu at windriver.com>
AuthorDate: Sun Sep 30 16:25:28 2018 +0800

    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 <Mingli.Yu at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb | 4 ++++
 1 file changed, 4 insertions(+)

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 fb15142..fbdf281 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.

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list