From: Yan Xinkuan <yanxk.f...@fujitsu.com> add ptest for bc, modified the original 'timetest' script, only using bc in the system to run package test.
Signed-off-by: Yan Xinkuan <yanxk.f...@fujitsu.com> --- .../distro/include/ptest-packagelists.inc | 1 + ...0001-ptest-only-use-bc-in-the-system.patch | 34 +++++++++++++++++++ meta/recipes-extended/bc/bc/run-ptest | 8 +++++ meta/recipes-extended/bc/bc_1.07.1.bb | 23 +++++++++++-- 4 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/bc/bc/0001-ptest-only-use-bc-in-the-system.patch create mode 100644 meta/recipes-extended/bc/bc/run-ptest diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 56088e4e66..5cbed54cc5 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -100,6 +100,7 @@ PTESTS_SLOW = "\ tcl-ptest \ util-linux-ptest \ valgrind-ptest \ + bc-ptest \ " PTESTS_SLOW:remove:riscv64 = "valgrind-ptest" diff --git a/meta/recipes-extended/bc/bc/0001-ptest-only-use-bc-in-the-system.patch b/meta/recipes-extended/bc/bc/0001-ptest-only-use-bc-in-the-system.patch new file mode 100644 index 0000000000..191db358e3 --- /dev/null +++ b/meta/recipes-extended/bc/bc/0001-ptest-only-use-bc-in-the-system.patch @@ -0,0 +1,34 @@ +From a7a19baf07cde3eaf8f0c007fea47f2c45475874 Mon Sep 17 00:00:00 2001 +From: Yan Xinkuan <yanxk.f...@fujitsu.com> +Date: Mon, 24 Oct 2022 16:08:37 +0800 +Subject: [PATCH] ptest: only use bc in the system + +use bc in the system to do ptest. + +Upstream-Status: Pending + +Signed-off-by: Yan Xinkuan <yanxk.f...@fujitsu.com> +--- + timetest | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Test/timetest b/Test/timetest +index 36d8d8e..313250a 100755 +--- a/Test/timetest ++++ b/Test/timetest +@@ -3,12 +3,9 @@ + # Time the functions. + # + SYSBC=/usr/bin/bc +-if [ x$BC = x ] ; then +- BC=../bc/bc +-fi + for file in exp.b ln.b sine.b atan.b jn.b mul.b div.b raise.b sqrt.b fact.b + do + for prog in $SYSBC $BC $OTHERBC + do + echo Timing $file with $prog + time $prog -l $file +-- +2.25.1 + diff --git a/meta/recipes-extended/bc/bc/run-ptest b/meta/recipes-extended/bc/bc/run-ptest new file mode 100644 index 0000000000..7e37e9ef01 --- /dev/null +++ b/meta/recipes-extended/bc/bc/run-ptest @@ -0,0 +1,8 @@ +#!/bin/bash +cd ./bc_test +if ./timetest; then + echo "PASS: bc/timetest" +else + echo "FAIL: bc/timetest" +fi + diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb index 1bec76bb2a..d931690d7d 100644 --- a/meta/recipes-extended/bc/bc_1.07.1.bb +++ b/meta/recipes-extended/bc/bc_1.07.1.bb @@ -15,11 +15,13 @@ DEPENDS = "flex-native" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://no-gen-libmath.patch \ file://libmath.h \ - file://0001-dc-fix-exit-code-of-q-command.patch" + file://0001-dc-fix-exit-code-of-q-command.patch \ + file://0001-ptest-only-use-bc-in-the-system.patch \ + file://run-ptest" SRC_URI[md5sum] = "cda93857418655ea43590736fc3ca9fc" SRC_URI[sha256sum] = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a" -inherit autotools texinfo update-alternatives +inherit autotools texinfo update-alternatives ptest PACKAGECONFIG ??= "readline" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" @@ -29,6 +31,23 @@ do_compile:prepend() { cp -f ${WORKDIR}/libmath.h ${B}/bc/libmath.h } +RDEPENDS:${PN}-ptest += "bash" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/atan.b ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/div.b ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/exp.b ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/fact.b ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/jn.b ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/ln.b ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/mul.b ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/raise.b ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/sine.b ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/sqrt.b ${D}${PTEST_PATH}/bc_test/ + install ${S}/Test/timetest ${D}${PTEST_PATH}/bc_test/ +} + ALTERNATIVE:${PN} = "bc dc" ALTERNATIVE_PRIORITY = "100" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#172121): https://lists.openembedded.org/g/openembedded-core/message/172121 Mute This Topic: https://lists.openembedded.org/mt/94554197/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-