diff options
| author |   Wenzong Fan <wenzong.fan@windriver.com> | 2015-09-16 01:35:21 -0400 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 15:39:45 +0200 |
| commit | e29f64293c7aa5adc1ce9c4a698e6af889f8bb4f (patch) | |
| tree | 52dd07e9ba044e07709f8511d7e005afd62e0bd6 /meta-oe | |
| parent | 8684b379bc62fed44ad52925182fc804f8137a2a (diff) | |
| download | meta-openembedded-contrib-e29f64293c7aa5adc1ce9c4a698e6af889f8bb4f.tar.gz | |
rsyslog: fix ptest
After rsyslog updated to 7.6.1, ptest fails to build & run since the
serial-tests config patch was dropped:
- rsyslog-use-serial-tests-config-needed-by-ptest.patch
This patch involved serial test harness:
+ AM_INIT_AUTOMAKE([serial-tests])
Which is deprecated in favour of parallel test harness. Automake
generated a parallel test harness by default. It features automatic
collection of the test scripts output in .log files ...
More details please refer to:
http://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harness.html
To enable the ptest with new changes, we should:
* add target 'buildtest-TESTS' for building test components;
* fix 'top_srcdir' and install required script 'test-driver';
* run testcases with target 'check-TESTS'.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest b/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest index 38a1d1b722..3770a75065 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh # -make -C tests -k runtest-TESTS +make -C tests -k check-TESTS diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb index 15b0f291df..b7a8140b25 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb @@ -70,7 +70,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," TESTDIR = "tests" do_compile_ptest() { - sed -i 's/\(^buildtest-TESTS: \)/\1 $(check_PROGRAMS) /' ${TESTDIR}/Makefile + echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile oe_runmake -C ${TESTDIR} buildtest-TESTS } @@ -82,8 +82,9 @@ do_install_ptest() { # do NOT need to rebuild Makefile itself sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - # fix the srcdir + # 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 # valgrind is not compatible with arm and mips, # so remove related test cases if there is no valgrind. @@ -91,6 +92,9 @@ do_install_ptest() { sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile fi + # install test-driver + install -m 644 ${S}/test-driver ${D}${PTEST_PATH}/${TESTDIR} + # install necessary links install -d ${D}${PTEST_PATH}/tools ln -sf ${sbindir}/rsyslogd ${D}${PTEST_PATH}/tools/rsyslogd |