diff options
author | Mingli Yu <Mingli.Yu@windriver.com> | 2018-09-30 16:25:28 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-09-30 08:42:03 -0700 |
commit | 0b663c4f9ae0fc2d6b2d7cda4baff4b00059a52d (patch) | |
tree | 0d283e5fd2c2eca9944da0567c898a567a5d50de | |
parent | a5ebab5dfea9683d0073604cf4f622226cfb60fe (diff) | |
download | meta-openembedded-0b663c4f9ae0fc2d6b2d7cda4baff4b00059a52d.tar.gz |
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@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb | 4 |
1 files changed, 4 insertions, 0 deletions
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 fb151428f..fbdf2818c 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() { | |||
86 | 86 | ||
87 | # do NOT need to rebuild Makefile itself | 87 | # do NOT need to rebuild Makefile itself |
88 | sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | 88 | sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile |
89 | # do NOT need to rebuild $(check_PROGRAMS) | ||
90 | sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
89 | 91 | ||
90 | # fix the srcdir, top_srcdir | 92 | # fix the srcdir, top_srcdir |
91 | sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | 93 | sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile |
92 | sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | 94 | sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile |
95 | # fix the abs_top_builddir | ||
96 | sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
93 | 97 | ||
94 | # valgrind is not compatible with arm and mips, | 98 | # valgrind is not compatible with arm and mips, |
95 | # so remove related test cases if there is no valgrind. | 99 | # so remove related test cases if there is no valgrind. |