From 4dddc721893ec27859ab23de6e40db1c890a35a0 Mon Sep 17 00:00:00 2001 From: Yang Yanchao Date: Tue, 1 Mar 2022 17:08:00 +0800 Subject: [PATCH] glibc:Merge testsuite_whitelist.aarch64 and testsuite_whitelist.x86_64 to testsuite_whitelist. Signed-off-by: Yang Yanchao --- glibc.spec | 20 +-- ...te_whitelist.x86_64 => testsuite_whitelist | 25 ++-- testsuite_whitelist.aarch64 | 115 ------------------ 3 files changed, 27 insertions(+), 133 deletions(-) rename testsuite_whitelist.x86_64 => testsuite_whitelist (84%) delete mode 100644 testsuite_whitelist.aarch64 diff --git a/glibc.spec b/glibc.spec index 58eae2a..a76444c 100644 --- a/glibc.spec +++ b/glibc.spec @@ -66,7 +66,7 @@ ############################################################################## Name: glibc Version: 2.34 -Release: 62 +Release: 63 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -80,8 +80,7 @@ Source6: LicenseList Source7: replace_same_file_to_hard_link.py %if %{with testsuite} -Source8: testsuite_whitelist.aarch64 -Source9: testsuite_whitelist.x86_64 +Source8: testsuite_whitelist %endif Patch1: glibc-c-utf8-locale.patch @@ -966,14 +965,11 @@ set -e %if %{with testsuite} omit_testsuite() { - whitelist=$1 - sed -i '/^#/d' $whitelist - sed -i '/^[\s]*$/d' $whitelist while read testsuite; do testsuite_escape=$(echo "$testsuite" | \ sed 's/\([.+?^$\/\\|()\[]\|\]\)/\\\0/g') sed -i "/${testsuite_escape}/d" rpmbuild.tests.sum.not-passing - done < "$whitelist" + done } # Increase timeouts @@ -996,9 +992,10 @@ fi grep -v ^PASS: tests.sum | grep -v ^UNSUPPORTED > rpmbuild.tests.sum.not-passing || true # Delete the testsuite from the whitelist -cp $RPM_SOURCE_DIR/testsuite_whitelist.%{_target_cpu} testsuite_whitelist -omit_testsuite testsuite_whitelist -rm -rf testsuite_whitelist +cat %{SOURCE8} | \ + grep -v "^$\|^#" | \ + awk -F':' '{if($2 == "" || $2 ~ /'%{_target_cpu}'/ ) {print $1}}' |\ + omit_testsuite set +x if test -s rpmbuild.tests.sum.not-passing ; then @@ -1288,6 +1285,9 @@ fi %endif %changelog +* Tue Mar 1 2022 Yang Yanchao - 2.34-63 +- Merge testsuite_whitelist.aarch64 and testsuite_whitelist.x86_64 to testsuite_whitelist. + * Tue Mar 1 2022 Qingqing Li - 2.34-62 - remove shared library's RPATH/RUNPATH for security diff --git a/testsuite_whitelist.x86_64 b/testsuite_whitelist similarity index 84% rename from testsuite_whitelist.x86_64 rename to testsuite_whitelist index 8a74a6f..024457e 100644 --- a/testsuite_whitelist.x86_64 +++ b/testsuite_whitelist @@ -1,3 +1,9 @@ +# USAGE: +# If it's a generic error: +# testsuite +# If the test case fails on part of the architecture: +# testsuite:arch1,arch2 + # These test cases failed due to gcc_secure conform/ISO/setjmp.h/conform conform/ISO/stdlib.h/conform @@ -57,7 +63,7 @@ elf/circleload1 elf/constload1 elf/dblload elf/dblunload -elf/ifuncmain6pie +elf/ifuncmain6pie:x86_64 elf/lateglobal elf/reldep6 elf/resolvfail @@ -83,34 +89,37 @@ conform/XOPEN2K8/ndbm.h/linknamespace conform/XPG42/ndbm.h/conform conform/XPG42/ndbm.h/linknamespace -# Test whether the date/time is correct under different -# language libraries, use case problems, and see that +# Test whether the date/time is correct under different +# language libraries, use case problems, and see that # the compiled language library itself has no errors # https://sourceware.org/bugzilla/show_bug.cgi?id=23164 localedata/tst-langinfo-newlocale-static -# The use case itself passed but because +# The use case itself passed but because # test-xfail-tst-protected1a/test-xfail-tst-protected1b was added elf/tst-protected1a elf/tst-protected1b -# the test case is due to check whether a macro is defined -# in the header files. As GLIBC evolves, the position of the +# the test case is due to check whether a macro is defined +# in the header files. As GLIBC evolves, the position of the # macro changes, causing the use case to fail posix/annexc -# Check whether sys/mman.h is consistent with linux/mman.h. +# Check whether sys/mman.h is consistent with linux/mman.h. # kernel has a self-developed macro that does not require glibc adaptation # https://gitee.com/src-openeuler/kernel/issues/I4BZ9T?from=project-issue misc/tst-mman-consts # It need to build GliBC on a platform that supports CET -elf/check-cet +elf/check-cet:x86_64 # Add the tst-nss-files-hosts-long.root/etc/hosts of glibc to # the /etc/hosts directory of the system, and then run sucess nss/tst-nss-files-hosts-long +# The test case fails due to OBS machine restrictions which can be passed locally. +elf/tst-debug1:aarch64 + # This test case often fails in CI which is the high-pressure environment. # No better solution is available. This test case is shielded. rt/tst-cpuclock2 diff --git a/testsuite_whitelist.aarch64 b/testsuite_whitelist.aarch64 deleted file mode 100644 index bb0b3fa..0000000 --- a/testsuite_whitelist.aarch64 +++ /dev/null @@ -1,115 +0,0 @@ -# These test cases failed due to gcc_secure -conform/ISO/setjmp.h/conform -conform/ISO/stdlib.h/conform -conform/ISO/stdlib.h/linknamespace -conform/ISO/string.h/conform -conform/ISO11/setjmp.h/conform -conform/ISO11/stdio.h/conform -conform/ISO11/stdlib.h/conform -conform/ISO11/stdlib.h/linknamespace -conform/ISO11/string.h/conform -conform/ISO11/wchar.h/conform -conform/ISO99/setjmp.h/conform -conform/ISO99/stdio.h/conform -conform/ISO99/stdlib.h/conform -conform/ISO99/stdlib.h/linknamespace -conform/ISO99/string.h/conform -conform/ISO99/wchar.h/conform -conform/POSIX/stdlib.h/conform -conform/POSIX/stdlib.h/linknamespace -conform/POSIX/string.h/conform -conform/POSIX2008/fcntl.h/conform -conform/POSIX2008/mqueue.h/conform -conform/POSIX2008/stdio.h/conform -conform/POSIX2008/stdlib.h/conform -conform/POSIX2008/stdlib.h/linknamespace -conform/POSIX2008/wchar.h/conform -conform/UNIX98/stdlib.h/conform -conform/UNIX98/string.h/conform -conform/UNIX98/unistd.h/conform -conform/UNIX98/unistd.h/linknamespace -conform/UNIX98/wchar.h/conform -conform/XOPEN2K/fcntl.h/conform -conform/XOPEN2K/mqueue.h/conform -conform/XOPEN2K/stdio.h/conform -conform/XOPEN2K/stdlib.h/conform -conform/XOPEN2K/string.h/conform -conform/XOPEN2K/syslog.h/conform -conform/XOPEN2K/unistd.h/conform -conform/XOPEN2K/unistd.h/linknamespace -conform/XOPEN2K/wchar.h/conform -conform/XOPEN2K8/fcntl.h/conform -conform/XOPEN2K8/mqueue.h/conform -conform/XOPEN2K8/stdio.h/conform -conform/XOPEN2K8/stdlib.h/conform -conform/XOPEN2K8/syslog.h/conform -conform/XOPEN2K8/unistd.h/conform -conform/XOPEN2K8/unistd.h/linknamespace -conform/XOPEN2K8/wchar.h/conform -conform/XPG4/stdlib.h/conform -conform/XPG4/stdlib.h/linknamespace -conform/XPG4/string.h/conform -conform/XPG4/unistd.h/conform -conform/XPG42/stdlib.h/conform -conform/XPG42/string.h/conform -conform/XPG42/unistd.h/conform -elf/circleload1 -elf/constload1 -elf/dblload -elf/dblunload -elf/lateglobal -elf/reldep6 -elf/resolvfail -elf/tst-global1 -elf/tst-tls20 -nptl/tst-execstack - -# GCC no longer implements -conform/UNIX98/varargs.h/conform -conform/UNIX98/varargs.h/linknamespace -conform/XPG4/varargs.h/conform -conform/XPG4/varargs.h/linknamespace -conform/XPG42/varargs.h/conform -conform/XPG42/varargs.h/linknamespace - -# These cases depend on gdbm-devel -conform/UNIX98/ndbm.h/conform -conform/UNIX98/ndbm.h/linknamespace -conform/XOPEN2K/ndbm.h/conform -conform/XOPEN2K/ndbm.h/linknamespace -conform/XOPEN2K8/ndbm.h/conform -conform/XOPEN2K8/ndbm.h/linknamespace -conform/XPG42/ndbm.h/conform -conform/XPG42/ndbm.h/linknamespace - -# Test whether the date/time is correct under different -# language libraries, use case problems, and see that -# the compiled language library itself has no errors -# https://sourceware.org/bugzilla/show_bug.cgi?id=23164 -localedata/tst-langinfo-newlocale-static - -# The use case itself passed but because -# test-xfail-tst-protected1a/test-xfail-tst-protected1b was added -elf/tst-protected1a -elf/tst-protected1b - -# the test case is due to check whether a macro is defined -# in the header files. As GLIBC evolves, the position of the -# macro changes, causing the use case to fail -posix/annexc - -# Check whether sys/mman.h is consistent with linux/mman.h. -# kernel has a self-developed macro that does not require glibc adaptation -# https://gitee.com/src-openeuler/kernel/issues/I4BZ9T?from=project-issue -misc/tst-mman-consts - -# Add the tst-nss-files-hosts-long.root/etc/hosts of glibc to -# the /etc/hosts directory of the system, and then run sucess -nss/tst-nss-files-hosts-long - -# The test case fails due to OBS machine restrictions which can be passed locally. -elf/tst-debug1 - -# This test case often fails in CI which is the high-pressure environment. -# No better solution is available. This test case is shielded. -rt/tst-cpuclock2 -- Gitee