glibc: ptest: Add running glibc time related test suite (Y2038) with ptest
PATCH v2 1/1 glibc: ptest: Add running glibc time related test suite (Y2038) with ptest
This patch introduces new recipe - namely 'glibc-tests', which builds and installs time related (to check if Y2038 support works) glibc test suite to OE/Yocto built image.
It reuses code from already available 'glibc-testsuite' recipe, which is run with 'bitbake glibc-testsuite -c check' and uses qemu to execute remotely (via SSH) tests on some emulated machine.
This recipe installs time related glibc tests on some rootfs image. Afterwards, those tests can be executed on the real hardware, to facilitate validation of it with Y2038 problem compliance.
To test time related subset - one needs to call:
ptest-runner glibc-tests
then change the date after Y2038 threshold for 32 bit systems:
date -s "20 JAN 2038 18:00:00"
and then run ptest-runner again.
To facilitate debugging, source files are provided by default with the unstripped debugging symbols. Such approach would reduce the already complex recipe (as it inherits base glibc one), so there is no need to also install *-dbg and *-src packages.
---
Changes for v2:
- Just focus on time related set of tests as those can be run as standalone
- Reuse of already built tests (from glibc-tests.inc) and depoloy them on the HW target.
- Provide single 'run-ptest' script.
- Update the recipe to run with newest poky's -master
--- .../distro/include/ptest-packagelists.inc | 1 + meta/recipes-core/glibc/glibc-tests_2.34.bb | 112 ++++++++++++++++++ meta/recipes-core/glibc/glibc/run-ptest | 37 ++++++ 3 files changed, 150 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc-tests_2.34.bb create mode 100755 meta/recipes-core/glibc/glibc/run-ptest
meta/conf/distro/include/ptest-packagelists.inc +1 -0
@@ -61,6 +61,7 @@ PTESTS_FAST = "\ slang-ptest \ wayland-ptest \ zlib-ptest \ + glibc-tests-ptest \ " PTESTS_FAST:remove:mips64 = "qemu-ptest" PTESTS_PROBLEMS:append:mips64 = "qemu-ptest"
meta/recipes-core/glibc/glibc-tests_2.34.bb new file +112 -0
112 lines not on this page · raw message
meta/recipes-core/glibc/glibc/run-ptest new file +37 -0
@@ -0,0 +1,37 @@ +#!/bin/sh +# ptest script for glibc - to run time related tests to +# facilitate Y2038 validation +# Run with 'ptest-runner glibc-tests' + +output() { + retcode=$? + if [ $retcode -eq 0 ] + then echo "PASS: $i" + elif [ $retcode -eq 77 ] + then echo "SKIP: $i" + else echo "FAIL: $i" + fi +} + +# Allow altering time on the target +export GLIBC_TEST_ALLOW_TIME_SETTING="1" + +tst_time64=$(ls -r ${PWD}/tests/glibc-ptest/*-time64) + +# Remove '-time64' suffix - those tests are also time +# related +tst_time_tmp=$(sed -e "s/-time64$//" <<< ${tst_time64}) + +# Run tests supporting only 32 bit time +for i in ${tst_time_tmp} +do + $i >/dev/null 2>&1 + output +done + +# Run tests supporting only 64 bit time +for i in ${tst_time64} +do + $i >/dev/null 2>&1 + output +done
Signature · 1 line
2.20.1
Hello,
I'm sorry for the late reply but this still failed on the AB:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/2719/steps/11/logs/stdio
Quoted 227 lines · ?ukasz Majewski
This patch introduces new recipe - namely 'glibc-tests', which builds and installs time related (to check if Y2038 support works) glibc test suite to OE/Yocto built image.
It reuses code from already available 'glibc-testsuite' recipe, which is run with 'bitbake glibc-testsuite -c check' and uses qemu to execute remotely (via SSH) tests on some emulated machine.
This recipe installs time related glibc tests on some rootfs image. Afterwards, those tests can be executed on the real hardware, to facilitate validation of it with Y2038 problem compliance.
To test time related subset - one needs to call:
ptest-runner glibc-tests
then change the date after Y2038 threshold for 32 bit systems:
date -s "20 JAN 2038 18:00:00"
and then run ptest-runner again.To facilitate debugging, source files are provided by default with the unstripped debugging symbols. Such approach would reduce the already complex recipe (as it inherits base glibc one), so there is no need to also install *-dbg and *-src packages.
Signed-off-by Lukasz Majewski <[email protected]>---
Changes for v2:
- Just focus on time related set of tests as those can be run as standalone
- Reuse of already built tests (from glibc-tests.inc) and depoloy them on the HW target.
- Provide single 'run-ptest' script.
- Update the recipe to run with newest poky's -master--- .../distro/include/ptest-packagelists.inc | 1 + meta/recipes-core/glibc/glibc-tests_2.34.bb | 112 ++++++++++++++++++ meta/recipes-core/glibc/glibc/run-ptest | 37 ++++++ 3 files changed, 150 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc-tests_2.34.bb create mode 100755 meta/recipes-core/glibc/glibc/run-ptestmeta/conf/distro/include/ptest-packagelists.inc +1
-0@@ -61,6 +61,7 @@ PTESTS_FAST = "\ slang-ptest \ wayland-ptest \ zlib-ptest \ + glibc-tests-ptest \ " PTESTS_FAST:remove:mips64 = "qemu-ptest" PTESTS_PROBLEMS:append:mips64 = "qemu-ptest"meta/recipes-core/glibc/glibc-tests_2.34.bb new file +112
-0@@ -0,0 +1,112 @@ +require glibc_${PV}.bb +require glibc-tests.inc + +inherit ptest + +SRC_URI:append = " \ + file://run-ptest \ +" + +SUMMARY = "glibc tests to be run with ptest" + +# Erase some variables already set by glibc_${PV} +python __anonymous() { + # Remove packages provided by glibc build, we only need a subset of them + d.setVar("PACKAGES", "${PN}") + + d.setVar("PROVIDES", "${PN}") + d.setVar("RPROVIDES", "${PN} glibc-ptest") + + d.setVar("RRECOMMENDS", "") +} + +# Remove any lefovers from original glibc recipe +RPROVIDES:${PN} = "${PN}" +RRECOMMENDS:${PN} = "" +RDEPENDS:${PN} = " glibc sed" +DEPENDS:append = " sed" + +# Just build tests for target - do not run them +do_check:append () { + oe_runmake -i check run-built-tests=no +} +addtask do_check after do_compile before do_install_ptest_base + +glibc_strip_build_directory () { + # Delete all non executable files from build directory + find ${B} ! -executable -type f -delete + + # Remove build dynamic libraries and links to them as + # those are already installed in the target device + find ${B} -type f -name "*.so" -delete + find ${B} -type l -name "*.so*" -delete + + # Remove headers (installed with glibc) + find ${B} -type f -name "*.h" -delete + + find ${B} -type f -name "isomac" -delete + find ${B} -type f -name "annexc" -delete +} + +do_install_ptest_base () { + glibc_strip_build_directory + + ls -r ${B}/*/*-time64 > ${B}/tst_time64 + + # Remove '-time64' suffix - those tests are also time related + sed -e "s/-time64$//" ${B}/tst_time64 > ${B}/tst_time_tmp + tst_time=$(cat ${B}/tst_time_tmp ${B}/tst_time64) + + rm ${B}/tst_time_tmp ${B}/tst_time64 + echo "${tst_time}" + + # Install build test programs to the image + install -d ${D}${PTEST_PATH}/tests/glibc-ptest/ + + for f in "${tst_time}" + do + cp -r ${f} ${D}${PTEST_PATH}/tests/glibc-ptest/ + done + + install -d ${D}${PTEST_PATH} + cp ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/ + +} + +# The datadir directory is required to allow core (and reused) +# glibc cleanup function to finish correctly, as this directory +# is not created for ptests +stash_locale_package_cleanup:prepend () { + mkdir -p ${PKGD}${datadir} +} + +stash_locale_sysroot_cleanup:prepend () { + mkdir -p ${SYSROOT_DESTDIR}${datadir} +} + +# Prevent the do_package() task to set 'libc6' prefix +# for glibc tests related packages +python populate_packages:prepend () { + if d.getVar('DEBIAN_NAMES'): + d.setVar('DEBIAN_NAMES', '') +} + +FILES:${PN} = "${PTEST_PATH}/* /usr/src/debug/glibc-tests/*" + +EXCLUDE_FROM_SHLIBS = "1" + +# Install debug data in .debug and sources in /usr/src/debug +# It is more handy to have _all_ the sources and symbols in one +# place (package) as this recipe will be used for validation and +# debugging. +PACKAGE_DEBUG_SPLIT_STYLE = "debug" + +# glibc test cases violate by default some Yocto/OE checks (staticdev, +# textrel) +# 'debug-files' - add everything (including debug) into one package +# (no need to install/build *-src package) +INSANE_SKIP:${PN} += "staticdev textrel debug-files rpaths" + +deltask do_stash_locale +do_install[noexec] = "1" +do_populate_sysroot[noexec] = "1"meta/recipes-core/glibc/glibc/run-ptest new file +37
-0@@ -0,0 +1,37 @@ +#!/bin/sh +# ptest script for glibc - to run time related tests to +# facilitate Y2038 validation +# Run with 'ptest-runner glibc-tests' + +output() { + retcode=$? + if [ $retcode -eq 0 ] + then echo "PASS: $i" + elif [ $retcode -eq 77 ] + then echo "SKIP: $i" + else echo "FAIL: $i" + fi +} + +# Allow altering time on the target +export GLIBC_TEST_ALLOW_TIME_SETTING="1" + +tst_time64=$(ls -r ${PWD}/tests/glibc-ptest/*-time64) + +# Remove '-time64' suffix - those tests are also time +# related +tst_time_tmp=$(sed -e "s/-time64$//" <<< ${tst_time64}) + +# Run tests supporting only 32 bit time +for i in ${tst_time_tmp} +do + $i >/dev/null 2>&1 + output +done + +# Run tests supporting only 64 bit time +for i in ${tst_time64} +do + $i >/dev/null 2>&1 + output +doneSignature · 11 lines
2.20.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157113): https://lists.openembedded.org/g/openembedded-core/message/157113 Mute This Topic: https://lists.openembedded.org/mt/86438618/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi Alexandre,
Quoted 6 lines
Hello,
I'm sorry for the late reply but this still failed on the AB:
https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/2719/steps/11/logs/stdio
Thanks for the info. I will fix it and submit v3.
Quoted 216 lines · ?ukasz Majewski
Quoted 215 lines
This patch introduces new recipe - namely 'glibc-tests', which builds and installs time related (to check if Y2038 support works) glibc test suite to OE/Yocto built image.
It reuses code from already available 'glibc-testsuite' recipe, which is run with 'bitbake glibc-testsuite -c check' and uses qemu to execute remotely (via SSH) tests on some emulated machine.
This recipe installs time related glibc tests on some rootfs image. Afterwards, those tests can be executed on the real hardware, to facilitate validation of it with Y2038 problem compliance.
To test time related subset - one needs to call:
ptest-runner glibc-tests
then change the date after Y2038 threshold for 32 bit systems:
date -s "20 JAN 2038 18:00:00"
and then run ptest-runner again.To facilitate debugging, source files are provided by default with the unstripped debugging symbols. Such approach would reduce the already complex recipe (as it inherits base glibc one), so there is no need to also install *-dbg and *-src packages.
Signed-off-by Lukasz Majewski <[email protected]>---
Changes for v2:
- Just focus on time related set of tests as those can be run as standalone
- Reuse of already built tests (from glibc-tests.inc) and depoloy them on the HW target.
- Provide single 'run-ptest' script.
- Update the recipe to run with newest poky's -master--- .../distro/include/ptest-packagelists.inc | 1 + meta/recipes-core/glibc/glibc-tests_2.34.bb | 112 ++++++++++++++++++ meta/recipes-core/glibc/glibc/run-ptest | 37 ++++++ 3 files changed, 150 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc-tests_2.34.bb create mode 100755 meta/recipes-core/glibc/glibc/run-ptest(quoted diff) +0
-0b/meta/conf/distro/include/ptest-packagelists.inc index
2e324f8da4..fd52fa72a4100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -61,6 +61,7 @@PTESTS_FAST = "\ slang-ptest \ wayland-ptest \ zlib-ptest \meta/conf/distro/include/ptest-packagelists.inc +1
-0+ glibc-tests-ptest \ " PTESTS_FAST:remove:mips64 = "qemu-ptest" PTESTS_PROBLEMS:append:mips64 = "qemu-ptest"(quoted diff) +0
-0b/meta/recipes-core/glibc/glibc-tests_2.34.bb new file mode 100644 index 0000000000..f1d5d073b6
meta/recipes-core/glibc/glibc-tests_2.34.bb new file +14
-0@@ -0,0 +1,112 @@ +require glibc_${PV}.bb +require glibc-tests.inc + +inherit ptest + +SRC_URI:append = " \ + file://run-ptest \ +" + +SUMMARY = "glibc tests to be run with ptest" + +# Erase some variables already set by glibc_${PV} +python __anonymous() { + # Remove packages provided by glibc build, we only need asubset of them
meta/recipes-core/glibc/glibc-tests_2.34.bb new file +42
-0+ d.setVar("PACKAGES", "${PN}") + + d.setVar("PROVIDES", "${PN}") + d.setVar("RPROVIDES", "${PN} glibc-ptest") + + d.setVar("RRECOMMENDS", "") +} + +# Remove any lefovers from original glibc recipe +RPROVIDES:${PN} = "${PN}" +RRECOMMENDS:${PN} = "" +RDEPENDS:${PN} = " glibc sed" +DEPENDS:append = " sed" + +# Just build tests for target - do not run them +do_check:append () { + oe_runmake -i check run-built-tests=no +} +addtask do_check after do_compile before do_install_ptest_base + +glibc_strip_build_directory () { + # Delete all non executable files from build directory + find ${B} ! -executable -type f -delete + + # Remove build dynamic libraries and links to them as + # those are already installed in the target device + find ${B} -type f -name "*.so" -delete + find ${B} -type l -name "*.so*" -delete + + # Remove headers (installed with glibc) + find ${B} -type f -name "*.h" -delete + + find ${B} -type f -name "isomac" -delete + find ${B} -type f -name "annexc" -delete +} + +do_install_ptest_base () { + glibc_strip_build_directory + + ls -r ${B}/*/*-time64 > ${B}/tst_time64 + + # Remove '-time64' suffix - those tests are also timerelated
meta/recipes-core/glibc/glibc-tests_2.34.bb new file +48
-0+ sed -e "s/-time64$//" ${B}/tst_time64 > ${B}/tst_time_tmp + tst_time=$(cat ${B}/tst_time_tmp ${B}/tst_time64) + + rm ${B}/tst_time_tmp ${B}/tst_time64 + echo "${tst_time}" + + # Install build test programs to the image + install -d ${D}${PTEST_PATH}/tests/glibc-ptest/ + + for f in "${tst_time}" + do + cp -r ${f} ${D}${PTEST_PATH}/tests/glibc-ptest/ + done + + install -d ${D}${PTEST_PATH} + cp ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/ + +} + +# The datadir directory is required to allow core (and reused) +# glibc cleanup function to finish correctly, as this directory +# is not created for ptests +stash_locale_package_cleanup:prepend () { + mkdir -p ${PKGD}${datadir} +} + +stash_locale_sysroot_cleanup:prepend () { + mkdir -p ${SYSROOT_DESTDIR}${datadir} +} + +# Prevent the do_package() task to set 'libc6' prefix +# for glibc tests related packages +python populate_packages:prepend () { + if d.getVar('DEBIAN_NAMES'): + d.setVar('DEBIAN_NAMES', '') +} + +FILES:${PN} = "${PTEST_PATH}/* /usr/src/debug/glibc-tests/*" + +EXCLUDE_FROM_SHLIBS = "1" + +# Install debug data in .debug and sources in /usr/src/debug +# It is more handy to have _all_ the sources and symbols in one +# place (package) as this recipe will be used for validation and +# debugging. +PACKAGE_DEBUG_SPLIT_STYLE = "debug" + +# glibc test cases violate by default some Yocto/OE checks(staticdev, +# textrel)
meta/recipes-core/glibc/glibc-tests_2.34.bb new file +7
-0+# 'debug-files' - add everything (including debug) into one package +# (no need to install/build *-src package) +INSANE_SKIP:${PN} += "staticdev textrel debug-files rpaths" + +deltask do_stash_locale +do_install[noexec] = "1" +do_populate_sysroot[noexec] = "1"(quoted diff) +0
-0b/meta/recipes-core/glibc/glibc/run-ptest new file mode 100755 index 0000000000..f637986105
meta/recipes-core/glibc/glibc/run-ptest new file +36
-0@@ -0,0 +1,37 @@ +#!/bin/sh +# ptest script for glibc - to run time related tests to +# facilitate Y2038 validation +# Run with 'ptest-runner glibc-tests' + +output() { + retcode=$? + if [ $retcode -eq 0 ] + then echo "PASS: $i" + elif [ $retcode -eq 77 ] + then echo "SKIP: $i" + else echo "FAIL: $i" + fi +} + +# Allow altering time on the target +export GLIBC_TEST_ALLOW_TIME_SETTING="1" + +tst_time64=$(ls -r ${PWD}/tests/glibc-ptest/*-time64) + +# Remove '-time64' suffix - those tests are also time +# related +tst_time_tmp=$(sed -e "s/-time64$//" <<< ${tst_time64}) + +# Run tests supporting only 32 bit time +for i in ${tst_time_tmp} +do + $i >/dev/null 2>&1 + output +done + +# Run tests supporting only 64 bit time +for i in ${tst_time64} +do + $i >/dev/null 2>&1 + output
Quoted 10 lines
Quoted 8 lines
meta/recipes-core/glibc/glibc/run-ptest new file +1
-0+doneSignature · 1 line
2.20.1
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: [email protected]