ltp-testsuite: bump version to 20220527
PATCH 1/1 ltp-testsuite: bump version to 20220527
From: Petr Vorel <[email protected]>
Add 2 patches from upstream which are required to fix compilation, Remove patch accepted upstream.
Update list of broken tests under musl (confstr01.c was fixed).
Refresh 0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch (still carry it case there is somebody using old musl based toolchain).
Signed-off-by Petr Vorel <[email protected]>
--- ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 50 ++++++------ .../0002-kvm-Fix-compilation-on-x86.patch | 40 ++++++++++ ...nel-fs-declare-int-openlog-as-static.patch | 77 ------------------- ...efined-reference-to-__stack_chk_fail.patch | 41 ++++++++++ package/ltp-testsuite/ltp-testsuite.hash | 6 +- package/ltp-testsuite/ltp-testsuite.mk | 3 +- 6 files changed, 110 insertions(+), 107 deletions(-) create mode 100644 package/ltp-testsuite/0002-kvm-Fix-compilation-on-x86.patch delete mode 100644 package/ltp-testsuite/0002-testcases-kernel-fs-declare-int-openlog-as-static.patch create mode 100644 package/ltp-testsuite/0003-kvm-Fix-undefined-reference-to-__stack_chk_fail.patch
package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +25 -25
@@ -29,7 +29,7 @@ Signed-off-by: Petr Vorel <[email protected]> [ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/[email protected]/, -rebased for 20210927 ] +rebased for 20220527 ] But this patch is not going to get upstreamed because it got fixed in Linux kernel: a85cbe6159ff "uapi: move constants from <linux/kernel.h> to <linux/const.h>"
@@ -56,7 +56,7 @@ Signed-off-by: Petr Vorel <[email protected]> diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h new file mode 100644 -index 0000000000..d0e0e93d7f +index 000000000..d0e0e93d7 --- /dev/null +++ b/include/lapi/sysinfo.h @@ -0,0 +1,22 @@
@@ -83,7 +83,7 @@ index 0000000000..d0e0e93d7f + +#endif /* SYSINFO_H__ */ diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h -index d99441c86f..0d26e9d455 100644 +index 81c4b0844..a8c02d7df 100644 --- a/include/tst_safe_macros.h +++ b/include/tst_safe_macros.h @@ -12,7 +12,7 @@
@@ -96,7 +96,7 @@ index d99441c86f..0d26e9d455 100644 #include <libgen.h> #include <signal.h> diff --git a/lib/safe_macros.c b/lib/safe_macros.c -index a5b6bc5047..87d922a928 100644 +index a5b6bc504..87d922a92 100644 --- a/lib/safe_macros.c +++ b/lib/safe_macros.c @@ -11,7 +11,7 @@
@@ -109,7 +109,7 @@ index a5b6bc5047..87d922a928 100644 #include <fcntl.h> #include <libgen.h> diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index 4a49747613..000688f5a3 100644 +index 0d20bb17c..21a3a5ba0 100644 --- a/lib/tst_memutils.c +++ b/lib/tst_memutils.c @@ -6,7 +6,7 @@
@@ -119,15 +119,15 @@ index 4a49747613..000688f5a3 100644 -#include <sys/sysinfo.h> +#include "lapi/sysinfo.h" #include <stdlib.h> - + #define TST_NO_DEFAULT_MAIN diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c -index 20cb95191d..3462dc3f82 100644 +index fb991ce8b..0fccd5405 100644 --- a/testcases/kernel/mem/mtest01/mtest01.c +++ b/testcases/kernel/mem/mtest01/mtest01.c @@ -20,7 +20,6 @@ */ - + #include <sys/types.h> -#include <sys/sysinfo.h> #include <sys/wait.h>
@@ -135,14 +135,14 @@ index 20cb95191d..3462dc3f82 100644 #include <signal.h> @@ -29,6 +28,7 @@ #include <unistd.h> - + #include "lapi/abisize.h" +#include "lapi/sysinfo.h" #include "tst_test.h" - + #define FIVE_HUNDRED_MB (500ULL*1024*1024) diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c -index 263b8e78bf..4fa52e6eae 100644 +index 6d218801c..8af11a030 100644 --- a/testcases/kernel/syscalls/madvise/madvise06.c +++ b/testcases/kernel/syscalls/madvise/madvise06.c @@ -46,7 +46,7 @@
@@ -152,10 +152,10 @@ index 263b8e78bf..4fa52e6eae 100644 -#include <sys/sysinfo.h> +#include "lapi/sysinfo.h" #include "tst_test.h" - #include "tst_cgroup.h" - + + #define CHUNK_SZ (400*1024*1024L) diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c -index 2ea44a2beb..a237345ef7 100644 +index 2ea44a2be..a237345ef 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c @@ -69,7 +69,7 @@
@@ -164,11 +164,11 @@ index 2ea44a2beb..a237345ef7 100644 #include <sys/signal.h> -#include <sys/sysinfo.h> +#include "lapi/sysinfo.h" - + #include "test.h" - + diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c -index 7ad0e8bdcf..61fa1ab757 100644 +index 7ad0e8bdc..61fa1ab75 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c @@ -65,7 +65,7 @@
@@ -178,23 +178,23 @@ index 7ad0e8bdcf..61fa1ab757 100644 -#include <sys/sysinfo.h> +#include "lapi/sysinfo.h" #include <stdint.h> - + #include "test.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c -index af7cb6421e..dc5ae65e35 100644 +index af7cb6421..dc5ae65e3 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c @@ -13,7 +13,7 @@ - + */ - + -#include <sys/sysinfo.h> +#include "lapi/sysinfo.h" #include "lapi/namespaces_constants.h" #include "lapi/posix_clocks.h" #include "tst_test.h" diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c -index 22e7c36386..572701f9fd 100644 +index 22e7c3638..572701f9f 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c @@ -43,7 +43,7 @@
@@ -204,8 +204,8 @@ index 22e7c36386..572701f9fd 100644 -#include <sys/sysinfo.h> +#include "lapi/sysinfo.h" #endif - + #include "../testfrmw/testfrmw.h" --- -2.34.1 +-- +2.36.1
package/ltp-testsuite/0002-kvm-Fix-compilation-on-x86.patch new file +40 -0
@@ -0,0 +1,40 @@ +From: Petr Vorel <[email protected]> +Date: Mon, 6 Jun 2022 20:43:19 +0200 +Subject: [PATCH 1/2] kvm: Fix compilation on x86 + +Buildroot supports i386 pentium toolchains (br-i386-pentium-mmx-musl, +br-i386-pentium4-full) which fail to compile because as is run without --32. + +[ upstream status: a471d87ef ("kvm: Fix compilation on x86") ] + +Suggested-by: Martin Doucha <[email protected]> +Reviewed-by: Cyril Hrubis <[email protected]> +Signed-off-by: Petr Vorel <[email protected]> +--- + testcases/kernel/kvm/Makefile | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/testcases/kernel/kvm/Makefile b/testcases/kernel/kvm/Makefile +index adab56952..8d5193d8e 100644 +--- a/testcases/kernel/kvm/Makefile ++++ b/testcases/kernel/kvm/Makefile +@@ -17,11 +17,14 @@ FILTER_OUT_MAKE_TARGETS := lib_guest lib_host lib_x86 + ifeq ($(HOST_CPU),x86_64) + ifneq (,$(findstring m32,$(CFLAGS))) + HOST_CPU = x86 +- GUEST_CFLAGS += -m32 +- ASFLAGS += --32 + endif + endif + ++ifeq ($(HOST_CPU),x86) ++ GUEST_CFLAGS += -m32 ++ ASFLAGS += --32 ++endif ++ + # Some distros enable -pie by default. That breaks KVM payload linking. + ifdef LTP_CFLAGS_NOPIE + GUEST_CFLAGS += -fno-pie +-- +2.36.1 +
package/ltp-testsuite/0002-testcases-kernel-fs-declare-int-openlog-as-static.patch deleted +0 -77
77 lines not on this page · raw message
package/ltp-testsuite/0003-kvm-Fix-undefined-reference-to-__stack_chk_fail.patch new file +41 -0
41 lines not on this page · raw message
package/ltp-testsuite/ltp-testsuite.hash +3 -3
@@ -1,5 +1,5 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1 -sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20220527/ltp-full-20220527.tar.xz.sha1 +sha1 9741b6938ca79ad1f4bea32788a483f86d12fd65 ltp-full-20220527.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a ltp-full-20220121.tar.xz +sha256 d635afb5ec7b0de763ab50713baf9fbf65cf089da6e6768f816e4a166cbd17c4 ltp-full-20220527.tar.xz
package/ltp-testsuite/ltp-testsuite.mk +1 -2
@@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20220121 +LTP_TESTSUITE_VERSION = 20220527 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION)
@@ -80,7 +80,6 @@ LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ testcases/misc/math/float/float_bessel.c LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_MUSL) += \ - testcases/kernel/syscalls/confstr/confstr01.c \ testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ testcases/kernel/syscalls/getcontext/getcontext01.c \ testcases/kernel/syscalls/rt_tgsigqueueinfo/rt_tgsigqueueinfo01.c \
Signature · 6 lines
2.36.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot