helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-22 01:49:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsyslog: Fix the ptest path to test-driver

Browse Source 
Add a sed substitution for ${PTEST_PATH}/${TESTDIR}/Makefile that
transforms
 LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
 SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
to
 LOG_DRIVER = $(SHELL) $(top_builddir)/test-driver
 SH_LOG_DRIVER = $(SHELL) $(top_builddir)/test-driver
which is where the test-driver script can be found when installed.

The addition of this substition makes ptests work with or without an
automake patch in OE-Core that does the same thing.

Relates to [YOCTO #15635]

Signed-off-by: Ola x Nilsson <olani@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Ola x Nilsson 2024-11-13 15:25:22 +01:00 committed by Khem Raj
parent 953a453038
commit b7fec3e16f
No known key found for this signature in database
GPG Key ID: BB053355919D3314
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb
View File

@ -100,16 +100,18 @@ do_install_ptest() {
# some tests need to write to this directory as user 'daemon'
chmod 777 -R ${D}${PTEST_PATH}/tests
# 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
sed -e '# do NOT need to rebuild Makefile itself' \
-e 's/^Makefile:.*$/Makefile:/' \
-e '# do NOT need to rebuild $(check_PROGRAMS)' \
-e 's/^check-TESTS:.*$/check-TESTS:/' \
-e '# fix the srcdir, top_srcdir' \
-e 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' \
-e 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' \
-e '# fix the abs_top_builddir' \
-e 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' \
-e '# fix the path to test-driver' \
-e '/^\(SH_\)\?LOG_DRIVER/s/(top_srcdir)/(top_builddir)/' \
-i ${D}${PTEST_PATH}/${TESTDIR}/Makefile
# install test-driver
install -m 644 ${S}/test-driver ${D}${PTEST_PATH}