diff options
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/ptest-packagelists.inc | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/time64.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-y2038-tests_2.41.bb | 107 | ||||
-rwxr-xr-x | meta/recipes-core/glibc/glibc/run-ptest | 37 |
5 files changed, 0 insertions, 149 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 2b47d3103c..f1bff80586 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -215,7 +215,6 @@ RECIPE_MAINTAINER:pn-glibc = "Khem Raj <raj.khem@gmail.com>" | |||
215 | RECIPE_MAINTAINER:pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>" | 215 | RECIPE_MAINTAINER:pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>" |
216 | RECIPE_MAINTAINER:pn-glibc-mtrace = "Khem Raj <raj.khem@gmail.com>" | 216 | RECIPE_MAINTAINER:pn-glibc-mtrace = "Khem Raj <raj.khem@gmail.com>" |
217 | RECIPE_MAINTAINER:pn-glibc-scripts = "Khem Raj <raj.khem@gmail.com>" | 217 | RECIPE_MAINTAINER:pn-glibc-scripts = "Khem Raj <raj.khem@gmail.com>" |
218 | RECIPE_MAINTAINER:pn-glibc-y2038-tests = "Lukasz Majewski <lukma@denx.de>" | ||
219 | RECIPE_MAINTAINER:pn-glibc-testsuite = "Khem Raj <raj.khem@gmail.com>" | 218 | RECIPE_MAINTAINER:pn-glibc-testsuite = "Khem Raj <raj.khem@gmail.com>" |
220 | RECIPE_MAINTAINER:pn-gmp = "Khem Raj <raj.khem@gmail.com>" | 219 | RECIPE_MAINTAINER:pn-gmp = "Khem Raj <raj.khem@gmail.com>" |
221 | RECIPE_MAINTAINER:pn-glslang = "Jose Quaresma <quaresma.jose@gmail.com>" | 220 | RECIPE_MAINTAINER:pn-glslang = "Jose Quaresma <quaresma.jose@gmail.com>" |
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index f3fdededf6..9fb3332384 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc | |||
@@ -86,8 +86,6 @@ PTESTS_FAST = "\ | |||
86 | xz \ | 86 | xz \ |
87 | zlib \ | 87 | zlib \ |
88 | " | 88 | " |
89 | PTESTS_FAST:append:libc-glibc = " glibc-y2038-tests" | ||
90 | PTESTS_PROBLEMS:remove:libc-glibc = "glibc-y2038-tests" | ||
91 | PTESTS_FAST:remove:mips64 = "qemu" | 89 | PTESTS_FAST:remove:mips64 = "qemu" |
92 | PTESTS_PROBLEMS:append:mips64 = " qemu" | 90 | PTESTS_PROBLEMS:append:mips64 = " qemu" |
93 | PTESTS_FAST:remove:riscv32 = "qemu" | 91 | PTESTS_FAST:remove:riscv32 = "qemu" |
diff --git a/meta/conf/distro/include/time64.inc b/meta/conf/distro/include/time64.inc index 5122e2a122..24a81c83f1 100644 --- a/meta/conf/distro/include/time64.inc +++ b/meta/conf/distro/include/time64.inc | |||
@@ -20,7 +20,6 @@ TARGET_CC_ARCH:append:powerpc = "${@bb.utils.contains('TUNE_FEATURES', 'm32', '$ | |||
20 | TARGET_CC_ARCH:append:x86 = "${@bb.utils.contains('TUNE_FEATURES', 'm32', '${GLIBC_64BIT_TIME_FLAGS}', '', d)}" | 20 | TARGET_CC_ARCH:append:x86 = "${@bb.utils.contains('TUNE_FEATURES', 'm32', '${GLIBC_64BIT_TIME_FLAGS}', '', d)}" |
21 | 21 | ||
22 | GLIBC_64BIT_TIME_FLAGS:pn-glibc = "" | 22 | GLIBC_64BIT_TIME_FLAGS:pn-glibc = "" |
23 | GLIBC_64BIT_TIME_FLAGS:pn-glibc-y2038-tests = "" | ||
24 | GLIBC_64BIT_TIME_FLAGS:pn-glibc-testsuite = "" | 23 | GLIBC_64BIT_TIME_FLAGS:pn-glibc-testsuite = "" |
25 | # pipewire-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to | 24 | # pipewire-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to |
26 | # both 32 and 64 bit file APIs. But it does not handle the time side? | 25 | # both 32 and 64 bit file APIs. But it does not handle the time side? |
@@ -33,7 +32,6 @@ GLIBC_64BIT_TIME_FLAGS:pn-gcc-sanitizers = "" | |||
33 | # Caused by the flags exceptions above | 32 | # Caused by the flags exceptions above |
34 | INSANE_SKIP:append:pn-gcc-sanitizers = " 32bit-time" | 33 | INSANE_SKIP:append:pn-gcc-sanitizers = " 32bit-time" |
35 | INSANE_SKIP:append:pn-glibc = " 32bit-time" | 34 | INSANE_SKIP:append:pn-glibc = " 32bit-time" |
36 | INSANE_SKIP:append:pn-glibc-y2038-tests = " 32bit-time" | ||
37 | 35 | ||
38 | # Strace has tests that call 32 bit API directly, which is fair enough, e.g. | 36 | # Strace has tests that call 32 bit API directly, which is fair enough, e.g. |
39 | # /usr/lib/strace/ptest/tests/ioctl_termios uses 32-bit api 'ioctl' | 37 | # /usr/lib/strace/ptest/tests/ioctl_termios uses 32-bit api 'ioctl' |
diff --git a/meta/recipes-core/glibc/glibc-y2038-tests_2.41.bb b/meta/recipes-core/glibc/glibc-y2038-tests_2.41.bb deleted file mode 100644 index 9ea09a4e12..0000000000 --- a/meta/recipes-core/glibc/glibc-y2038-tests_2.41.bb +++ /dev/null | |||
@@ -1,107 +0,0 @@ | |||
1 | require glibc_${PV}.bb | ||
2 | require glibc-tests.inc | ||
3 | |||
4 | inherit ptest features_check | ||
5 | REQUIRED_DISTRO_FEATURES = "ptest" | ||
6 | |||
7 | SRC_URI += "\ | ||
8 | file://run-ptest \ | ||
9 | " | ||
10 | |||
11 | SUMMARY = "glibc tests using time32/time64 interfaces to be run with ptest for the purpose of checking y2038 compatiblity" | ||
12 | |||
13 | # Erase some variables already set by glibc_${PV} | ||
14 | python __anonymous() { | ||
15 | # Remove packages provided by glibc build, we only need a subset of them | ||
16 | d.setVar("PACKAGES", "${PN} ${PN}-dbg ${PN}-ptest") | ||
17 | |||
18 | d.setVar("PROVIDES", "${PN} ${PN}-ptest") | ||
19 | |||
20 | bbclassextend = d.getVar("BBCLASSEXTEND").replace("nativesdk", "").strip() | ||
21 | d.setVar("BBCLASSEXTEND", bbclassextend) | ||
22 | d.setVar("RRECOMMENDS", "") | ||
23 | d.setVar("SYSTEMD_SERVICE:nscd", "") | ||
24 | d.setVar("SYSTEMD_PACKAGES", "") | ||
25 | } | ||
26 | |||
27 | # Remove any leftovers from original glibc recipe | ||
28 | RPROVIDES:${PN} = "${PN}" | ||
29 | RRECOMMENDS:${PN} = "" | ||
30 | RDEPENDS:${PN} = "glibc libgcc sed bash" | ||
31 | RDEPENDS:${PN}-ptest = "${PN}" | ||
32 | DEPENDS += "sed" | ||
33 | |||
34 | export oe_srcdir = "${exec_prefix}/src/debug/glibc/${PV}/" | ||
35 | |||
36 | # Just build tests for target - do not run them | ||
37 | do_check:append () { | ||
38 | oe_runmake -i check run-built-tests=no | ||
39 | } | ||
40 | addtask do_check after do_compile before do_install_ptest_base | ||
41 | |||
42 | glibc_strip_build_directory () { | ||
43 | # Delete all non executable files from build directory | ||
44 | find ${B} ! -executable -type f -delete | ||
45 | |||
46 | # Remove build dynamic libraries and links to them as | ||
47 | # those are already installed in the target device | ||
48 | find ${B} -type f -name "*.so" -delete | ||
49 | find ${B} -type l -name "*.so*" -delete | ||
50 | |||
51 | # Remove headers (installed with glibc) | ||
52 | find ${B} -type f -name "*.h" -delete | ||
53 | |||
54 | find ${B} -type f -name "isomac" -delete | ||
55 | find ${B} -type f -name "annexc" -delete | ||
56 | } | ||
57 | |||
58 | do_install_ptest_base () { | ||
59 | glibc_strip_build_directory | ||
60 | |||
61 | ls -r ${B}/*/*-time64 > ${B}/tst_time64 | ||
62 | |||
63 | # Remove '-time64' suffix - those tests are also time related | ||
64 | sed -e "s/-time64$//" ${B}/tst_time64 > ${B}/tst_time_tmp | ||
65 | tst_time=$(cat ${B}/tst_time_tmp ${B}/tst_time64) | ||
66 | |||
67 | rm ${B}/tst_time_tmp ${B}/tst_time64 | ||
68 | echo "${tst_time}" | ||
69 | |||
70 | # Install build test programs to the image | ||
71 | install -d ${D}${PTEST_PATH}/tests/glibc-ptest/ | ||
72 | |||
73 | for f in "${tst_time}" | ||
74 | do | ||
75 | cp -r ${f} ${D}${PTEST_PATH}/tests/glibc-ptest/ | ||
76 | done | ||
77 | |||
78 | install -d ${D}${PTEST_PATH} | ||
79 | cp ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH}/ | ||
80 | |||
81 | } | ||
82 | |||
83 | # The datadir directory is required to allow core (and reused) | ||
84 | # glibc cleanup function to finish correctly, as this directory | ||
85 | # is not created for ptests | ||
86 | stash_locale_package_cleanup:prepend () { | ||
87 | mkdir -p ${PKGD}${datadir} | ||
88 | } | ||
89 | |||
90 | stash_locale_sysroot_cleanup:prepend () { | ||
91 | mkdir -p ${SYSROOT_DESTDIR}${datadir} | ||
92 | } | ||
93 | |||
94 | # Prevent the do_package() task to set 'libc6' prefix | ||
95 | # for glibc tests related packages | ||
96 | python populate_packages:prepend () { | ||
97 | if d.getVar('DEBIAN_NAMES'): | ||
98 | d.setVar('DEBIAN_NAMES', '') | ||
99 | } | ||
100 | |||
101 | FILES:${PN} = "${PTEST_PATH}/* /usr/src/debug/${PN}/*" | ||
102 | |||
103 | EXCLUDE_FROM_SHLIBS = "1" | ||
104 | |||
105 | deltask do_stash_locale | ||
106 | do_install[noexec] = "1" | ||
107 | do_populate_sysroot[noexec] = "1" | ||
diff --git a/meta/recipes-core/glibc/glibc/run-ptest b/meta/recipes-core/glibc/glibc/run-ptest deleted file mode 100755 index cb71c75682..0000000000 --- a/meta/recipes-core/glibc/glibc/run-ptest +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | #!/bin/bash | ||
2 | # ptest script for glibc - to run time related tests to | ||
3 | # facilitate Y2038 validation | ||
4 | # Run with 'ptest-runner glibc-tests' | ||
5 | |||
6 | output() { | ||
7 | retcode=$? | ||
8 | if [ $retcode -eq 0 ] | ||
9 | then echo "PASS: $i" | ||
10 | elif [ $retcode -eq 77 ] | ||
11 | then echo "SKIP: $i" | ||
12 | else echo "FAIL: $i" | ||
13 | fi | ||
14 | } | ||
15 | |||
16 | # Allow altering time on the target | ||
17 | export GLIBC_TEST_ALLOW_TIME_SETTING="1" | ||
18 | |||
19 | tst_time64=$(ls -r ${PWD}/tests/glibc-ptest/*-time64) | ||
20 | |||
21 | # Remove '-time64' suffix - those tests are also time | ||
22 | # related | ||
23 | tst_time_tmp=$(sed -e "s/-time64$//" <<< ${tst_time64}) | ||
24 | |||
25 | # Do not run tests supporting only 32 bit time | ||
26 | #for i in ${tst_time_tmp} | ||
27 | #do | ||
28 | # $i >/dev/null 2>&1 | ||
29 | # output | ||
30 | #done | ||
31 | |||
32 | # Run tests supporting only 64 bit time | ||
33 | for i in ${tst_time64} | ||
34 | do | ||
35 | $i >/dev/null 2>&1 | ||
36 | output | ||
37 | done | ||