diff options
author | Ola x Nilsson <olani@axis.com> | 2024-11-13 15:25:21 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-11-19 16:59:07 -0800 |
commit | 953a4530383cc23ddc83f60bfacadc580d7c50cc (patch) | |
tree | f1c953b5581903e11f0a5b4299e78853ddcfc1a8 | |
parent | e7d0ab859dbb1cd92e4b4cfdaef0ba0f78610957 (diff) | |
download | meta-openembedded-953a4530383cc23ddc83f60bfacadc580d7c50cc.tar.gz |
librelp: Fix the ptest path to test-driver
Add a sed substitution for ${PTEST_PATH}/${TESTDIR}/Makefile that
transforms
SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
to
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>
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb index 49847047ac..65b5c8476f 100644 --- a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb +++ b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb | |||
@@ -59,14 +59,16 @@ do_install_ptest() { | |||
59 | # some tests need to write to this directory | 59 | # some tests need to write to this directory |
60 | chmod 777 -R ${D}${PTEST_PATH}/${TESTDIR} | 60 | chmod 777 -R ${D}${PTEST_PATH}/${TESTDIR} |
61 | 61 | ||
62 | # do NOT need to rebuild Makefile or $(check_PROGRAMS) | 62 | sed -e '# do NOT need to rebuild Makefile or $(check_PROGRAMS)' \ |
63 | sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | 63 | -e 's/^Makefile:.*$/Makefile:/' \ |
64 | sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | 64 | -e 's/^check-TESTS:.*$/check-TESTS:/' \ |
65 | 65 | -e '# fix the srcdir, top_srcdir, abs_top_builddir' \ | |
66 | # fix the srcdir, top_srcdir, abs_top_builddir | 66 | -e 's,^\(srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' \ |
67 | sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | 67 | -e 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' \ |
68 | sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | 68 | -e 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' \ |
69 | sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | 69 | -e '# fix the path to test-driver' \ |
70 | -e '/^SH_LOG_DRIVER =/s/(top_srcdir)/(top_builddir)/' \ | ||
71 | -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
70 | 72 | ||
71 | # install test-driver | 73 | # install test-driver |
72 | install -m 644 ${S}/test-driver ${D}${PTEST_PATH} | 74 | install -m 644 ${S}/test-driver ${D}${PTEST_PATH} |