package/ltp-testsuite: update patch status
PATCH 1/2 package/ltp-testsuite: update patch status
--- ...pi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +10 -1
@@ -26,7 +26,16 @@ In file included from ../include/tst_safe_macros.h:15, x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here Signed-off-by: Petr Vorel <[email protected]> -[ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201001231256.6930-1-petr.vorel at gmail.com/ ] + +[ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201001231256.6930-1-petr.vorel at gmail.com/ + +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>" + +This patch was also backported to stable and LTS versions, +which we use since buildroot 54584d233b "{linux, linux-headers}: bump +5.{4, 10}.x 4.{4, 9, 14, 19} series". +We just wait for all musl based toolchains to be rebuilt. ] --- include/lapi/sysinfo.h | 22 +++++++++++++++++++ include/tst_safe_macros.h | 2 +-
Signature · 1 line
2.30.0
PATCH 2/2 package/ltp-testsuite: bump version to 20210121
Add --disable-metadata configure option. Buildroot by default disable packages' doc generation. Also generating LTP metadata documentation would require have host package, which could be complicated since the LTP build system is autoconf but not automake based.
Drop cacheflush01 patch (from this release) and rebase musl workaround patch.
---
Hi,
well I'll probably have to prepare host-ltp-testsuite package soon, because we plan to have one build-time dependency from our sources, but not needed so far.
Tested:
andes-nds32 [ 1/45]: OK
arm-aarch64 [ 2/45]: OK
bootlin-x86-64-glibc [ 3/45]: OK
br-aarch64-glibc [ 4/45]: OK
br-arcle-hs38 [ 5/45]: OK
br-arm-basic [ 6/45]: OK
br-arm-cortex-a9-glibc [ 7/45]: OK
br-arm-cortex-a9-musl [ 8/45]: OK
br-arm-cortex-m4-full [ 9/45]: SKIPPED
br-arm-full [10/45]: OK
br-arm-full-nothread [11/45]: SKIPPED
br-arm-full-static [12/45]: OK
br-i386-pentium-mmx-musl [13/45]: OK
br-i386-pentium4-full [14/45]: OK
br-microblazeel-full [15/45]: OK
br-mipsel-o32-full [16/45]: OK
br-mips32r6-el-hf-glibc [17/45]: OK
br-mips64-n64-full [18/45]: OK
br-mips64r6-el-hf-glibc [19/45]: OK
br-m68k-5208-full [20/45]: SKIPPED
br-m68k-68040-full [21/45]: OK
br-nios2-glibc [22/45]: SKIPPED
br-openrisc-uclibc [23/45]: OK
br-powerpc-e500mc-full [24/45]: OK
br-powerpc-603e-basic-cpp [25/45]: OK
br-powerpc64le-power8-glibc [26/45]: OK
br-powerpc64-power7-glibc [27/45]: OK
br-riscv32 [28/45]: OK
br-riscv64 [29/45]: OK
br-riscv64-musl [30/45]: OK
br-sh4-full [31/45]: OK
br-sparc-uclibc [32/45]: SKIPPED
br-sparc64-glibc [33/45]: OK
br-xtensa-full [34/45]: OK
br-x86-64-core2-full [35/45]: OK
br-x86-64-musl [36/45]: OK
linaro-aarch64-be [37/45]: OK
linaro-aarch64 [38/45]: OK
linaro-arm [39/45]: OK
sourcery-arm-armv4t [40/45]: OK
sourcery-arm [41/45]: OK
sourcery-arm-thumb2 [42/45]: OK
sourcery-mips [43/45]: OK
sourcery-mips64 [44/45]: OK
sourcery-nios2 [45/45]: SKIPPED45 builds, 6 skipped, 0 build failed, 0 legal-info failed
...01-cacheflush01-Rewrite-into-new-API.patch | 225 ------------------ ...ysinfo.h-to-fix-build-with-MUSL-libc.patch | 53 ++--- package/ltp-testsuite/ltp-testsuite.hash | 4 +- package/ltp-testsuite/ltp-testsuite.mk | 6 +- 4 files changed, 32 insertions(+), 256 deletions(-) delete mode 100644 package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch
package/ltp-testsuite/0001-cacheflush01-Rewrite-into-new-API.patch deleted +0 -225
@@ -1,225 +0,0 @@ -From 48edd768850825a4d01e5e5e737122333fc55cdf Mon Sep 17 00:00:00 2001 -From: Petr Vorel <[email protected]> -Date: Fri, 2 Oct 2020 21:29:58 +0200 -Subject: [PATCH] cacheflush01: Rewrite into new API - -This syscall is currently (v5.9) supported on these architectures: -arc, csky, mips, m68k, nds32, sh - -constants are missing for m68k, not sure if the testcase is valid for it. -Untested. - -Test for __LTP__NR_INVALID_SYSCALL saves adding autotools check for -<asm/cachectl.h>. - -Signed-off-by: Petr Vorel <[email protected]> ---- -[ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201002202416.28972-1-petr.vorel at gmail.com/ ] - .../kernel/syscalls/cacheflush/cacheflush01.c | 173 ++++-------------- - 1 file changed, 40 insertions(+), 133 deletions(-) - -diff --git a/testcases/kernel/syscalls/cacheflush/cacheflush01.c b/testcases/kernel/syscalls/cacheflush/cacheflush01.c -index 29cf2014a..6ad8b953a 100644 ---- a/testcases/kernel/syscalls/cacheflush/cacheflush01.c -+++ b/testcases/kernel/syscalls/cacheflush/cacheflush01.c -@@ -1,157 +1,64 @@ --/******************************************************************************/ --/* Copyright (c) Maxin John <[email protected]>, 2009 */ --/* LKML Reference: http://lkml.org/lkml/2009/4/9/203 */ --/* This program is free software; you can redistribute it and/or modify */ --/* it under the terms of the GNU General Public License as published by */ --/* the Free Software Foundation; either version 2 of the License, or */ --/* (at your option) any later version. */ --/* */ --/* This program is distributed in the hope that it will be useful, */ --/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ --/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */ --/* the GNU General Public License for more details. */ --/* */ --/* You should have received a copy of the GNU General Public License */ --/* along with this program; if not, write to the Free Software */ --/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ --/* */ --/******************************************************************************/ --/******************************************************************************/ --/* */ --/* File: cacheflush01.c */ --/* */ --/* Description: The cacheflush_check() syscall */ --/* Tests EINVAL error of cacheflush system call. */ --/* Its expected behaviour is cacheflush() should return -EINVAL */ --/* when cache parameter is not one of ICACHE, DCACHE, or BCACHE. */ --/* */ --/* Usage: <for command-line> */ --/* cacheflush01 [-c n] [-e][-i n] [-I x] [-p x] [-t] */ --/* where, -c n : Run n copies concurrently. */ --/* -e : Turn on errno logging. */ --/* -i n : Execute test n times. */ --/* -I x : Execute test for x seconds. */ --/* -P x : Pause for x seconds between iterations. */ --/* -t : Turn on syscall timing. */ --/* */ --/* Total Tests: 1 */ --/* */ --/* Test Name: cacheflush01 */ --/******************************************************************************/ -+// SPDX-License-Identifier: GPL-2.0-or-later - --#include <unistd.h> --#include <stdio.h> --#include <stdlib.h> --#include <errno.h> -- --#include "test.h" -+#include "tst_test.h" - #include "lapi/syscalls.h" - - #if __NR_cacheflush != __LTP__NR_INVALID_SYSCALL -+ - #include <asm/cachectl.h> --#else -+ -+/* -+ * m68k does not have these constants -+ */ -+ - #ifndef ICACHE --#define ICACHE (1<<0) /* flush instruction cache */ -+# define ICACHE (1<<0) - #endif -+ - #ifndef DCACHE --#define DCACHE (1<<1) /* writeback and flush data cache */ -+# define DCACHE (1<<1) - #endif -+ - #ifndef BCACHE --#define BCACHE (ICACHE|DCACHE) /* flush both caches */ --#endif -+# define BCACHE (ICACHE|DCACHE) - #endif - --char *TCID = "cacheflush01"; --int TST_TOTAL = 1; -+#define CACHE_DESC(x) .cache = x, .desc = #x - --/* Extern Global Functions */ --/******************************************************************************/ --/* */ --/* Function: cleanup */ --/* */ --/* Description: Performs all one time clean up for this test on successful */ --/* completion, premature exit or failure. Closes all temporary */ --/* files, removes all temporary directories exits the test with */ --/* appropriate return code by calling tst_exit() function. */ --/* */ --/* Input: None. */ --/* */ --/* Output: None. */ --/* */ --/* Return: On failure - Exits calling tst_exit(). Non '0' return code. */ --/* On success - Exits calling tst_exit(). With '0' return code. */ --/* */ --/******************************************************************************/ --void cleanup(void) --{ -+static struct test_case_t { -+ int cache; -+ const char *desc; -+} test_cases[] = { -+ { CACHE_DESC(ICACHE) }, -+ { CACHE_DESC(DCACHE) }, -+ { CACHE_DESC(BCACHE) }, -+}; - -- tst_rmdir(); --} -+static char *addr; - --/* Local Functions */ --/******************************************************************************/ --/* */ --/* Function: setup */ --/* */ --/* Description: Performs all one time setup for this test. This function is */ --/* typically used to capture signals, create temporary dirs */ --/* and temporary files that may be used in the course of this */ --/* test. */ --/* */ --/* Input: None. */ --/* */ --/* Output: None. */ --/* */ --/* Return: On failure - Exits by calling cleanup(). */ --/* On success - returns 0. */ --/* */ --/******************************************************************************/ --void setup(void) -+static void setup(void) - { -- /* Capture signals if any */ -- /* Create temporary directories */ -- TEST_PAUSE; -- tst_tmpdir(); -+ addr = SAFE_MALLOC(getpagesize()); - } - --int main(int ac, char **av) -+static void test_cacheflush(unsigned int i) - { -+ struct test_case_t *tc = &test_cases[i]; - -- char *addr = NULL; -- -- tst_parse_opts(ac, av, NULL, NULL); -- -- setup(); -- -- tst_count = 0; -- /* Create some user address range */ -- addr = malloc(getpagesize()); -- if (addr == NULL) { -- tst_brkm(TFAIL | TTERRNO, cleanup, "malloc failed"); -- } -- -- /* Invokes cacheflush() with proper parameters */ -- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), ICACHE)); -- if (TEST_RETURN == 0) { -- tst_resm(TPASS, "passed with no errno"); -- } else { -- tst_resm(TFAIL, "failed with unexpected errno"); -- } -- -- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), DCACHE)); -- if (TEST_RETURN == 0) { -- tst_resm(TPASS, "passed with no errno"); -+ TEST(tst_syscall(__NR_cacheflush, addr, getpagesize(), tc->cache)); -+ if (TST_RET == 0) { -+ tst_res(TPASS, "%s passed", tc->desc); - } else { -- tst_resm(TFAIL, "failed with unexpected errno"); -+ tst_res(TFAIL | TTERRNO, "%s failed", tc->desc); - } -+} - -- TEST(ltp_syscall(__NR_cacheflush, addr, getpagesize(), BCACHE)); -- if (TEST_RETURN == 0) { -- tst_resm(TPASS, "passed with no errno"); -- } else { -- tst_resm(TFAIL, "failed with unexpected errno"); -- } -+static struct tst_test test = { -+ .setup = setup, -+ .test = test_cacheflush, -+ .tcnt = ARRAY_SIZE(test_cases), -+}; - -- cleanup(); -- tst_exit(); --} -+#else -+ TST_TEST_TCONF("system doesn't support cacheflush()"); -+#endif --- -2.28.0 -
package/ltp-testsuite/0002-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +26 -27
136 lines not on this page · raw message
package/ltp-testsuite/ltp-testsuite.hash +2 -2
@@ -1,4 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20200930/ltp-full-20200930.tar.xz.sha1 -sha1 f380c7afe71e03eabb1de668c0399267042cb0f7 ltp-full-20200930.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20210121/ltp-full-20210121.tar.xz.sha1 +sha1 ac9c1c711aed4319c5fbd0b665d36f75236a4ec2 ltp-full-20210121.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
package/ltp-testsuite/ltp-testsuite.mk +4 -2
@@ -4,14 +4,16 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20200930 +LTP_TESTSUITE_VERSION = 20210121 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) + LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+ LTP_TESTSUITE_LICENSE_FILES = COPYING LTP_TESTSUITE_CONF_OPTS += \ - --with-realtime-testsuite --with-open-posix-testsuite + --with-realtime-testsuite --with-open-posix-testsuite \ + --disable-metadata ifeq ($(BR2_LINUX_KERNEL),y) LTP_TESTSUITE_DEPENDENCIES += linux
Signature · 1 line
2.30.0
PATCH 2/2 package/ltp-testsuite: bump version to 20210121
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Petr" == Petr Vorel <[email protected]> writes:
Add --disable-metadata configure option. Buildroot by default disable packages' doc generation. Also generating LTP metadata documentation would require have host package, which could be complicated since the LTP build system is autoconf but not automake based.
Drop cacheflush01 patch (from this release) and rebase musl workaround patch.
Quoted 7 lines
Signed-off-by Petr Vorel <[email protected]>---
Hi,well I'll probably have to prepare host-ltp-testsuite package soon, because we plan to have one build-time dependency from our sources, but not needed so far.
OK. Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 package/ltp-testsuite: update patch status
In reply to Petr VorelQuoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Petr" == Petr Vorel <[email protected]> writes:
Signed-off-by Petr Vorel <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard