mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-30 00:50:00 +00:00
Code Issues Projects Releases Wiki Activity

rsyslog: fix ptest

Browse Source 
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>
This commit is contained in:
Wenzong Fan
2015-09-16 01:35:21 -04:00
committed by Martin Jansa
parent 8684b379bc
commit e29f64293c
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest
+1 -1
View File
@@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
# #
make -C tests -k runtest-TESTS make -C tests -k check-TESTS
meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb
+6 -2
View File
@@ -70,7 +70,7 @@ PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind,"
TESTDIR = "tests" TESTDIR = "tests"
do_compile_ptest() { 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 oe_runmake -C ${TESTDIR} buildtest-TESTS
} }
@@ -82,8 +82,9 @@ do_install_ptest() {
# do NOT need to rebuild Makefile itself # do NOT need to rebuild Makefile itself
sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile 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,^\(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, # valgrind is not compatible with arm and mips,
# so remove related test cases if there is no valgrind. # 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 sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
fi fi
# install test-driver
install -m 644 ${S}/test-driver ${D}${PTEST_PATH}/${TESTDIR}
# install necessary links # install necessary links
install -d ${D}${PTEST_PATH}/tools install -d ${D}${PTEST_PATH}/tools
ln -sf ${sbindir}/rsyslogd ${D}${PTEST_PATH}/tools/rsyslogd ln -sf ${sbindir}/rsyslogd ${D}${PTEST_PATH}/tools/rsyslogd