mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

ltp: Bump to 20190115

Browse Source 
This patch has been refreshed:
* 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch

These patches have been dropped as they have been merged:
* 0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
* 0001-setrlimit05-Use-another-method-to-get-bad-address.patch
* 0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch
* 0001-statx-fix-compile-errors.patch
* 0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch
* 0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch

This patch has been added:
* define-sigrtmin-and-sigrtmax-for-musl.patch

Added these rdependencies:
* file: for ld01, file01 and logrotate
* quota: for quota_remount_test01

(From OE-Core rev: d198364c1007aab6523787f9e1bb6bb274cc89ad)

Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Daniel Díaz
2019-02-21 12:21:03 -06:00
committed by Richard Purdie
parent db3b872493
commit 471168b615
14 changed files with 154 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/ltp/ltp/0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch
-57
View File
@@ -1,57 +0,0 @@
From c9edb0eaaca83c18ac7b5ea3330faad8d47d3fd1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 14 Dec 2018 06:44:02 -0800
Subject: [PATCH] getcpu01: Rename getcpu to avoid conflict with glibc >= 2.29
glibc has added getcpu() API starting with glibc 2.29 release, this
makes the static function in conflict and signatures are not same as
well.
Renaming helps to keep ltp build going
Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2018-December/010321.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
testcases/kernel/syscalls/getcpu/getcpu01.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/testcases/kernel/syscalls/getcpu/getcpu01.c b/testcases/kernel/syscalls/getcpu/getcpu01.c
index c927512ca..e850fe844 100644
--- a/testcases/kernel/syscalls/getcpu/getcpu01.c
+++ b/testcases/kernel/syscalls/getcpu/getcpu01.c
@@ -82,7 +82,7 @@ int sys_support = 0;
void cleanup(void);
void setup(void);
-static inline int getcpu(unsigned int *, unsigned int *, void *);
+static inline int get_cpu(unsigned int *, unsigned int *, void *);
unsigned int set_cpu_affinity(void);
unsigned int get_nodeid(unsigned int);
unsigned int max_cpuid(size_t, cpu_set_t *);
@@ -124,7 +124,7 @@ int main(int ac, char **av)
#ifdef __i386__
node_set = get_nodeid(cpu_set);
#endif
- TEST(getcpu(&cpu_id, &node_id, NULL));
+ TEST(get_cpu(&cpu_id, &node_id, NULL));
if (TEST_RETURN == 0) {
if (cpu_id != cpu_set) {
tst_resm(TFAIL, "getcpu() returned wrong value"
@@ -157,10 +157,10 @@ int main(int ac, char **av)
}
/*
- * getcpu() - calls the system call
+ * get_cpu() - calls the system call
*/
-static inline int getcpu(unsigned *cpu_id, unsigned *node_id,
- void *cache_struct)
+static inline int get_cpu(unsigned *cpu_id, unsigned *node_id,
+ void *cache_struct)
{
#if defined(__i386__)
return syscall(318, cpu_id, node_id, cache_struct);
--
2.20.0
meta/recipes-extended/ltp/ltp/0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch
-45
View File
@@ -1,45 +0,0 @@
From 76d8343ad300f6507233abcdf97629290e35848a Mon Sep 17 00:00:00 2001
From: Lei Yang <Lei.Yang@windriver.com>
Date: Wed, 29 Aug 2018 11:51:24 +0800
Subject: [PATCH] netns_helper.sh: use 'ping -6' when ping6 is not avaliable
ping6 has been merged into ping since 2015 by using "ping -6"
in some distributions (e.g. OpenEmbedded) they dropped ping6 completely
this patch will let both "ping -6" and ping6 work.
[pvorel: change was done in s20150815:
ebad35f ("ping: merge `ping6` command into `ping`"),
before that release switch '-6' didn't exist.
Upstream leaves ping6 symlink to distributions.]
Upstream-Status: Backport
[https://github.com/linux-test-project/ltp/commit/76d8343ad300f6507233abcdf97629290e35848a]
Signed-off-by: Lei Yang <Lei.Yang@windriver.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
testcases/kernel/containers/netns/netns_helper.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/containers/netns/netns_helper.sh b/testcases/kernel/containers/netns/netns_helper.sh
index 6aea10b..a9d0459 100755
--- a/testcases/kernel/containers/netns/netns_helper.sh
+++ b/testcases/kernel/containers/netns/netns_helper.sh
@@ -168,7 +168,12 @@ netns_setup()
ipv6)
IFCONF_IN6_ARG="inet6 add"
IP0=$6; IP1=$7;
- tping="ping6"; NETMASK=64
+ if which ping6 >/dev/null 2>&1; then
+ tping="ping6"
+ else
+ tping="ping -6"
+ fi
+ NETMASK=64
;;
*)
tst_brkm TBROK "second argument must be an ip version (ipv4|ipv6)"
--
2.7.4
meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
+3 -3
View File
@@ -43,8 +43,8 @@ index de51d43..810e5c8 100644
+ * 3. Should get ENOMEM or EINVAL.
*/
#define _XOPEN_SOURCE 600
@@ -93,8 +93,8 @@ int main(void)
#include <stdio.h>
@@ -92,8 +92,8 @@ int main(void)
(unsigned long)len);
pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd,
0);
@@ -55,7 +55,7 @@ index de51d43..810e5c8 100644
exit(PTS_PASS);
}
@@ -103,6 +103,6 @@ int main(void)
@@ -102,6 +102,6 @@ int main(void)
else
munmap(pa, len);
close(fd);
meta/recipes-extended/ltp/ltp/0001-setrlimit05-Use-another-method-to-get-bad-address.patch
-61
View File
@@ -1,61 +0,0 @@
From c4d02b23d12b7136b5739b3075e817fc037e41d4 Mon Sep 17 00:00:00 2001
From: "Hongzhi.Song" <hongzhi.song@windriver.com>
Date: Mon, 19 Nov 2018 23:07:01 -0800
Subject: [PATCH] setrlimit05: Use another method to get bad address
This testcase fails on mips32. The process is killed by SIGBUS which
is not as expect.
This is because:
((void *)-1) is not a legal bad address which causes the process
killed by SIGBUG on mips.
'tst_get_bad_addr()' returns an address that should works on mips
and other arches.
Upstream-Status: Accepted [80bed467bc6ab48a6cd88a8ab74ca15d08830cb0]
Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
---
testcases/kernel/syscalls/setrlimit/setrlimit05.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit05.c b/testcases/kernel/syscalls/setrlimit/setrlimit05.c
index e7167229b4..004a149a65 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit05.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit05.c
@@ -26,6 +26,8 @@
#include "tst_test.h"
+static void *bad_addr;
+
static void verify_setrlimit(void)
{
int status;
@@ -33,7 +35,7 @@ static void verify_setrlimit(void)
pid = SAFE_FORK();
if (!pid) {
- TEST(setrlimit(RLIMIT_NOFILE, (void *) -1));
+ TEST(setrlimit(RLIMIT_NOFILE, bad_addr));
if (TST_RET != -1) {
tst_res(TFAIL, "setrlimit() succeeded unexpectedly");
exit(0);
@@ -67,7 +69,13 @@ static void verify_setrlimit(void)
tst_res(TBROK, "child %s", tst_strstatus(status));
}
+static void setup(void)
+{
+ bad_addr = tst_get_bad_addr(NULL);
+}
+
static struct tst_test test = {
.test_all = verify_setrlimit,
.forks_child = 1,
+ .setup = setup,
};
--
2.11.0
meta/recipes-extended/ltp/ltp/0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch
-75
View File
@@ -1,75 +0,0 @@
From bb977ca0716ae98f10102c7122fe15bc0ddb5356 Mon Sep 17 00:00:00 2001
From: "Hongzhi.Song" <hongzhi.song@windriver.com>
Date: Thu, 20 Sep 2018 21:49:02 -0400
Subject: [PATCH] sigwaitinfo01: recent glibc calls syscall directly
glibc commit
8b0e795aaa44 ("Simplify Linux sig{timed}wait{info} implementations")
changed sigwaitinfo to call sigtimedwait, which calls rt_sigtimedwait
syscall directly.
So, an invalid pointer no longer crashes child process and test
reports failure. Fix it by accepting either crash or EFAULT.
Signed-off-by: Jan Stancek <jstancek@redhat.com>
Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2018-September/009338.html]
Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
---
.../kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 30 +++++++++++++++++++---
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
index 95a9436a4..8fa8ac34b 100644
--- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
+++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
@@ -371,19 +371,41 @@ void test_bad_address2(swi_func sigwaitinfo, int signo)
tst_brkm(TBROK | TERRNO, NULL, "fork() failed");
case 0:
signal(SIGSEGV, SIG_DFL);
+
+ /*
+ * depending on glibc implementation we should
+ * either crash or get EFAULT
+ */
TEST(sigwaitinfo((void *)1, NULL, NULL));
- _exit(0);
+ if (TEST_RETURN == -1 && TEST_ERRNO == EFAULT)
+ _exit(0);
+
+ tst_resm(TINFO, "swi_func returned: %ld, errno: %d",
+ TEST_RETURN, TEST_ERRNO);
+ _exit(1);
+
break;
default:
break;
}
SUCCEED_OR_DIE(waitpid, "waitpid failed", pid, &status, 0);
- if (WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV)
+
+ if ((WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV)
+ || (WIFEXITED(status) && WEXITSTATUS(status) == 0)) {
tst_resm(TPASS, "Test passed");
- else
- tst_resm(TFAIL, "Unrecognised child exit code");
+ return;
+ }
+
+ if (WIFEXITED(status)) {
+ tst_resm(TFAIL, "Unrecognised child exit code: %d",
+ WEXITSTATUS(status));
+ }
+ if (WIFSIGNALED(status)) {
+ tst_resm(TFAIL, "Unrecognised child termsig: %d",
+ WTERMSIG(status));
+ }
}
void test_bad_address3(swi_func sigwaitinfo, int signo)
--
2.11.0
meta/recipes-extended/ltp/ltp/0001-statx-fix-compile-errors.patch
-35
View File
@@ -1,35 +0,0 @@
From a945304b6a2286d0665c70250cc5475eb07fd21e Mon Sep 17 00:00:00 2001
From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Date: Wed, 26 Sep 2018 11:15:45 -0300
Subject: [PATCH] statx: fix compile errors
struct statx is only defined in sys/stat.h when _GNU_SOURCE is defined.
The testcases do define _GNU_SOURCE, but not the m4 struct check.
Upstream-Status: Backport
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: Cyril Hrubis <chrubis@suse.cz>
---
m4/ltp-statx.m4 | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/m4/ltp-statx.m4 b/m4/ltp-statx.m4
index 44303d30c..5f79a94cd 100644
--- a/m4/ltp-statx.m4
+++ b/m4/ltp-statx.m4
@@ -23,6 +23,11 @@ dnl
AC_DEFUN([LTP_CHECK_STATX],[
AC_CHECK_FUNCS(statx,,,[[#include <sys/stat.h>]])
AC_CHECK_HEADER(linux/fs.h,,,)
-AC_CHECK_TYPES([struct statx],,,[[#include <sys/stat.h>]])
-AC_CHECK_TYPES([struct statx_timestamp],,,[[#include <sys/stat.h>]])
+AC_CHECK_TYPES([struct statx],,,[[
+ #define _GNU_SOURCE
+ #include <sys/stat.h>
+]])
+AC_CHECK_TYPES([struct statx_timestamp],,,[[
+ #define _GNU_SOURCE
+ #include <sys/stat.h>]])
])
--
2.19.1
meta/recipes-extended/ltp/ltp/0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch
-184
View File
@@ -1,184 +0,0 @@
From 8de03ea1200480b922d5ba05b69dc94db60496f5 Mon Sep 17 00:00:00 2001
From: "Hongzhi.Song" <hongzhi.song@windriver.com>
Date: Sat, 15 Sep 2018 22:39:32 -0400
Subject: [PATCH] syscalls/fcntl: make OFD command use fcntl64() syscall on
32-bit
To cope with glibc commit:
06ab719d30b0 ("Fix Linux fcntl OFD locks for non-LFS architectures
(BZ#20251)")
WIP: Still need to test this with new glibc.
Test with old glibc look OK so far.
Signed-off-by: Jan Stancek <jstancek@redhat.com>
Upstream-Status: Backport
Backported from upstream maillist
https://lists.linux.it/pipermail/ltp/2018-September/009370.html
Signed-off-by: Hongzhi Song <hongzhi.song@windriver.com>
---
testcases/kernel/syscalls/fcntl/fcntl34.c | 12 +++++++---
testcases/kernel/syscalls/fcntl/fcntl36.c | 23 +++++++++++++-----
testcases/kernel/syscalls/fcntl/fcntl_common.h | 32 ++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 9 deletions(-)
create mode 100644 testcases/kernel/syscalls/fcntl/fcntl_common.h
diff --git a/testcases/kernel/syscalls/fcntl/fcntl34.c b/testcases/kernel/syscalls/fcntl/fcntl34.c
index aa29cf9..109f834 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl34.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl34.c
@@ -28,6 +28,7 @@
#include "lapi/fcntl.h"
#include "tst_safe_pthread.h"
#include "tst_test.h"
+#include "fcntl_common.h"
static int thread_cnt;
static const int max_thread_cnt = 32;
@@ -68,7 +69,12 @@ void *thread_fn_01(void *arg)
memset(buf, (intptr_t)arg, write_size);
- struct flock64 lck = {
+ /* see explanation in fcntl_common.h */
+ #ifdef USE_STRUCT_FLOCK
+ struct flock lck = {
+ #else
+ struct flock64 lck = {
+ #endif
.l_whence = SEEK_SET,
.l_start = 0,
.l_len = 1,
@@ -76,13 +82,13 @@ void *thread_fn_01(void *arg)
for (i = 0; i < writes_num; ++i) {
lck.l_type = F_WRLCK;
- SAFE_FCNTL(fd, F_OFD_SETLKW, &lck);
+ my_fcntl(fd, F_OFD_SETLKW, &lck);
SAFE_LSEEK(fd, 0, SEEK_END);
SAFE_WRITE(1, fd, buf, write_size);
lck.l_type = F_UNLCK;
- SAFE_FCNTL(fd, F_OFD_SETLKW, &lck);
+ my_fcntl(fd, F_OFD_SETLKW, &lck);
sched_yield();
}
diff --git a/testcases/kernel/syscalls/fcntl/fcntl36.c b/testcases/kernel/syscalls/fcntl/fcntl36.c
index 3246d13..f263b6b 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl36.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl36.c
@@ -57,6 +57,7 @@
#include "lapi/fcntl.h"
#include "tst_safe_pthread.h"
#include "tst_test.h"
+#include "fcntl_common.h"
static int thread_cnt;
static int fail_flag = 0;
@@ -87,7 +88,12 @@ static void *fn_ofd_w(void *arg)
int fd = SAFE_OPEN(fname, O_RDWR);
long wt = pa->cnt;
- struct flock64 lck = {
+ /* see explanation in fcntl_common.h */
+ #ifdef USE_STRUCT_FLOCK
+ struct flock lck = {
+ #else
+ struct flock64 lck = {
+ #endif
.l_whence = SEEK_SET,
.l_start = pa->offset,
.l_len = pa->length,
@@ -99,13 +105,13 @@ static void *fn_ofd_w(void *arg)
memset(buf, wt, pa->length);
lck.l_type = F_WRLCK;
- SAFE_FCNTL(fd, F_OFD_SETLKW, &lck);
+ my_fcntl(fd, F_OFD_SETLKW, &lck);
SAFE_LSEEK(fd, pa->offset, SEEK_SET);
SAFE_WRITE(1, fd, buf, pa->length);
lck.l_type = F_UNLCK;
- SAFE_FCNTL(fd, F_OFD_SETLKW, &lck);
+ my_fcntl(fd, F_OFD_SETLKW, &lck);
wt++;
if (wt >= 255)
@@ -166,7 +172,12 @@ static void *fn_ofd_r(void *arg)
int i;
int fd = SAFE_OPEN(fname, O_RDWR);
- struct flock64 lck = {
+ /* see explanation in fcntl_common.h */
+ #ifdef USE_STRUCT_FLOCK
+ struct flock lck = {
+ #else
+ struct flock64 lck = {
+ #endif
.l_whence = SEEK_SET,
.l_start = pa->offset,
.l_len = pa->length,
@@ -178,7 +189,7 @@ static void *fn_ofd_r(void *arg)
memset(buf, 0, pa->length);
lck.l_type = F_RDLCK;
- SAFE_FCNTL(fd, F_OFD_SETLKW, &lck);
+ my_fcntl(fd, F_OFD_SETLKW, &lck);
/* rlock acquired */
SAFE_LSEEK(fd, pa->offset, SEEK_SET);
@@ -209,7 +220,7 @@ static void *fn_ofd_r(void *arg)
}
lck.l_type = F_UNLCK;
- SAFE_FCNTL(fd, F_OFD_SETLK, &lck);
+ my_fcntl(fd, F_OFD_SETLK, &lck);
sched_yield();
}
diff --git a/testcases/kernel/syscalls/fcntl/fcntl_common.h b/testcases/kernel/syscalls/fcntl/fcntl_common.h
new file mode 100644
index 0000000..3fe399b
--- /dev/null
+++ b/testcases/kernel/syscalls/fcntl/fcntl_common.h
@@ -0,0 +1,32 @@
+#include "lapi/syscalls.h"
+
+/*
+ * glibc commit:
+ * 06ab719d30b0 ("Fix Linux fcntl OFD locks for non-LFS architectures (BZ#20251)")
+ * changed behavior of arg parameter for OFD commands. It is no
+ * longer passing arg directly to syscall, but expects it to be
+ * 'struct flock'.
+ *
+ * On 64-bit or _FILE_OFFSET_BITS == 64 we can use fcntl() and
+ * struct flock with any glibc version. struct flock and flock64
+ * should be identical.
+ *
+ * On 32-bit, older glibc would pass arg directly, recent one treats
+ * it as 'struct flock' and converts it to 'struct flock64'.
+ * So, for 32-bit we use fcntl64 syscall directly with struct flock64.
+ */
+#if __WORDSIZE == 64 || _FILE_OFFSET_BITS == 64
+#define USE_STRUCT_FLOCK
+static int my_fcntl(int fd, int cmd, void *lck)
+{
+ return SAFE_FCNTL(fd, cmd, lck);
+}
+#else
+static int my_fcntl(int fd, int cmd, void *lck)
+{
+ int ret = tst_syscall(__NR_fcntl64, fd, cmd, lck);
+ if (ret == -1)
+ tst_brk(TBROK|TERRNO, "fcntl64");
+ return ret;
+}
+#endif
--
2.8.1
meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch
+1 -2
View File
@@ -42,7 +42,7 @@ diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile
index 50a12fa..4f1987f 100644
--- a/testcases/kernel/Makefile
+++ b/testcases/kernel/Makefile
@@ -48,13 +48,16 @@ SUBDIRS += connectors \
@@ -49,12 +49,15 @@ SUBDIRS += connectors \
logging \
mem \
numa \
@@ -51,7 +51,6 @@ index 50a12fa..4f1987f 100644
security \
timers \
tracing \
module \
+ifneq ($(LIBC),musl)
+SUBDIRS += pty
meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
+1 -1
View File
@@ -16,7 +16,7 @@ diff --git a/include/old/test.h b/include/old/test.h
index b36764d83..cc6f1b551 100644
--- a/include/old/test.h
+++ b/include/old/test.h
@@ -44,6 +44,9 @@
@@ -17,6 +17,9 @@
#include <string.h>
#include <stdlib.h>
#include <stdint.h>
meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
+29 -161
View File
@@ -1,7 +1,7 @@
From a3cbee31daae2466bc8dcac36b33a01352693346 Mon Sep 17 00:00:00 2001
From fc2b47ad979a87bfbd11aeea3f67c26e7fb39e30 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 7 Jan 2016 19:40:08 +0000
Subject: [PATCH 01/26] Check if __GLIBC_PREREQ is defined before using it
Subject: [PATCH] Check if __GLIBC_PREREQ is defined before using it
__GLIBC_PREREQ is specific to glibc so it should be checked if it is
defined or not.
@@ -10,13 +10,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
---
testcases/kernel/syscalls/accept4/accept4_01.c | 9 ++++-
testcases/kernel/syscalls/getcpu/getcpu01.c | 39 +++++++++++++++++++++-
.../sched_getaffinity/sched_getaffinity01.c | 26 +++++++++++++++
3 files changed, 72 insertions(+), 2 deletions(-)
.../kernel/syscalls/accept4/accept4_01.c | 9 ++++++-
.../sched_getaffinity/sched_getaffinity01.c | 26 +++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/syscalls/accept4/accept4_01.c b/testcases/kernel/syscalls/accept4/accept4_01.c
index 6072bfa..2b090cb 100644
index dec4ef93b..c5d74b07f 100644
--- a/testcases/kernel/syscalls/accept4/accept4_01.c
+++ b/testcases/kernel/syscalls/accept4/accept4_01.c
@@ -64,6 +64,7 @@ static void cleanup(void)
@@ -59,131 +58,8 @@ index 6072bfa..2b090cb 100644
#else
acceptfd = accept4(lfd, (struct sockaddr *)&claddr, &addrlen,
closeonexec_flag | nonblock_flag);
diff --git a/testcases/kernel/syscalls/getcpu/getcpu01.c b/testcases/kernel/syscalls/getcpu/getcpu01.c
index c927512..921b107 100644
--- a/testcases/kernel/syscalls/getcpu/getcpu01.c
+++ b/testcases/kernel/syscalls/getcpu/getcpu01.c
@@ -62,6 +62,7 @@
#include <dirent.h>
#if defined(__i386__) || defined(__x86_64__)
+#if defined(__GLIBC__)
#if __GLIBC_PREREQ(2,6)
#if defined(__x86_64__)
#include <utmpx.h>
@@ -75,10 +76,17 @@ int sys_support = 0;
#else
int sys_support = 0;
#endif
+#else
+int sys_support = 0;
+#endif
+#if defined(__GLIBC__)
#if !(__GLIBC_PREREQ(2, 7))
#define CPU_FREE(ptr) free(ptr)
#endif
+#else
+#define CPU_FREE(ptr) free(ptr)
+#endif
void cleanup(void);
void setup(void);
@@ -164,7 +172,11 @@ static inline int getcpu(unsigned *cpu_id, unsigned *node_id,
{
#if defined(__i386__)
return syscall(318, cpu_id, node_id, cache_struct);
-#elif __GLIBC_PREREQ(2,6)
+#elif defined(__GLIBC__)
+#if __GLIBC_PREREQ(2,6)
+ *cpu_id = sched_getcpu();
+#endif
+#else
*cpu_id = sched_getcpu();
#endif
return 0;
@@ -191,15 +203,20 @@ unsigned int set_cpu_affinity(void)
cpu_set_t *set;
size_t size;
int nrcpus = 1024;
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 7)
realloc:
set = CPU_ALLOC(nrcpus);
#else
set = malloc(sizeof(cpu_set_t));
#endif
+#else
+ set = malloc(sizeof(cpu_set_t));
+#endif
if (set == NULL) {
tst_brkm(TFAIL, NULL, "CPU_ALLOC:errno:%d", errno);
}
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 7)
size = CPU_ALLOC_SIZE(nrcpus);
CPU_ZERO_S(size, set);
@@ -207,8 +224,13 @@ realloc:
size = sizeof(cpu_set_t);
CPU_ZERO(set);
#endif
+#else
+ size = sizeof(cpu_set_t);
+ CPU_ZERO(set);
+#endif
if (sched_getaffinity(0, size, set) < 0) {
CPU_FREE(set);
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 7)
if (errno == EINVAL && nrcpus < (1024 << 8)) {
nrcpus = nrcpus << 2;
@@ -220,10 +242,17 @@ realloc:
"NR_CPUS of the kernel is more than 1024, so we'd better use a newer glibc(>= 2.7)");
else
#endif
+#else
+ if (errno == EINVAL)
+ tst_resm(TFAIL,
+ "NR_CPUS of the kernel is more than 1024, so we'd better use a newer glibc(>= 2.7)");
+ else
+#endif
tst_resm(TFAIL, "sched_getaffinity:errno:%d", errno);
tst_exit();
}
cpu_max = max_cpuid(size, set);
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 7)
CPU_ZERO_S(size, set);
CPU_SET_S(cpu_max, size, set);
@@ -231,6 +260,10 @@ realloc:
CPU_ZERO(set);
CPU_SET(cpu_max, set);
#endif
+#else
+ CPU_ZERO(set);
+ CPU_SET(cpu_max, set);
+#endif
if (sched_setaffinity(0, size, set) < 0) {
CPU_FREE(set);
tst_brkm(TFAIL, NULL, "sched_setaffinity:errno:%d", errno);
@@ -247,11 +280,15 @@ unsigned int max_cpuid(size_t size, cpu_set_t * set)
{
unsigned int index, max = 0;
for (index = 0; index < size * BITS_PER_BYTE; index++)
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 7)
if (CPU_ISSET_S(index, size, set))
#else
if (CPU_ISSET(index, set))
#endif
+#else
+ if (CPU_ISSET(index, set))
+#endif
max = index;
return max;
}
diff --git a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
index 9d6a81a..4ed13b2 100644
index 02f04b909..d906d7e09 100644
--- a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
+++ b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
@@ -67,9 +67,11 @@ do { \
@@ -198,7 +74,7 @@ index 9d6a81a..4ed13b2 100644
int main(int ac, char **av)
{
@@ -96,14 +98,19 @@ static void do_test(void)
@@ -96,17 +98,26 @@ static void do_test(void)
pid_t unused_pid;
unsigned len;
@@ -206,27 +82,26 @@ index 9d6a81a..4ed13b2 100644
#if __GLIBC_PREREQ(2, 7)
realloc:
mask = CPU_ALLOC(nrcpus);
#else
mask = malloc(sizeof(cpu_set_t));
#endif
+#else
+ mask = malloc(sizeof(cpu_set_t));
+#endif
#else
mask = malloc(sizeof(cpu_set_t));
#endif
if (mask == NULL)
tst_brkm(TFAIL | TTERRNO, cleanup, "fail to get enough memory");
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 7)
len = CPU_ALLOC_SIZE(nrcpus);
CPU_ZERO_S(len, mask);
@@ -111,10 +118,15 @@ realloc:
len = sizeof(cpu_set_t);
CPU_ZERO(mask);
#endif
+#else
+ len = sizeof(cpu_set_t);
+ CPU_ZERO(mask);
+#endif
/* positive test */
#else
len = sizeof(cpu_set_t);
CPU_ZERO(mask);
@@ -115,11 +126,18 @@ realloc:
TEST(sched_getaffinity(0, len, mask));
if (TEST_RETURN == -1) {
CPU_FREE(mask);
@@ -234,50 +109,43 @@ index 9d6a81a..4ed13b2 100644
#if __GLIBC_PREREQ(2, 7)
if (errno == EINVAL && nrcpus < (1024 << 8)) {
nrcpus = nrcpus << 2;
@@ -126,17 +138,27 @@ realloc:
"newer glibc(>= 2.7)");
else
#endif
goto realloc;
}
+#else
+ if (errno == EINVAL)
+ tst_resm(TFAIL, "NR_CPUS > 1024, we'd better use a "
+ "newer glibc(>= 2.7)");
+ else
+#endif
tst_resm(TFAIL | TTERRNO, "fail to get cpu affinity");
cleanup();
} else {
#else
if (errno == EINVAL)
tst_resm(TFAIL, "NR_CPUS > 1024, we'd better use a "
@@ -132,8 +150,12 @@ realloc:
tst_resm(TINFO, "cpusetsize is %d", len);
tst_resm(TINFO, "mask.__bits[0] = %lu ", mask->__bits[0]);
for (i = 0; i < num; i++) {
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 7)
TEST(CPU_ISSET_S(i, len, mask));
#else
TEST(CPU_ISSET(i, mask));
#endif
+#else
+ TEST(CPU_ISSET(i, mask));
+#endif
if (TEST_RETURN != -1)
tst_resm(TPASS, "sched_getaffinity() succeed, "
"this process %d is running "
@@ -144,11 +166,15 @@ realloc:
#else
TEST(CPU_ISSET(i, mask));
#endif
@@ -144,8 +166,12 @@ realloc:
}
}
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 7)
CPU_ZERO_S(len, mask);
#else
CPU_ZERO(mask);
#endif
+#else
+ CPU_ZERO(mask);
+#endif
/* negative tests */
QUICK_TEST(sched_getaffinity(0, len, (cpu_set_t *) - 1));
QUICK_TEST(sched_getaffinity(0, 0, mask));
#else
CPU_ZERO(mask);
#endif
--
1.9.1
2.17.1
meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
+1 -1
View File
@@ -19,7 +19,7 @@ diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testca
index b785fe3..2918cc5 100755
--- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
@@ -283,6 +283,7 @@ test_proc_kill()
@@ -291,6 +291,7 @@ test_proc_kill()
pid=$!
TST_CHECKPOINT_WAIT 0
echo $pid > tasks
meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
+1 -1
View File
@@ -32,7 +32,7 @@ index be105f6da..813a51d9c 100644
TST_TESTFUNC=test
TST_NEEDS_TMPDIR=1
TST_NEEDS_CMDS="$AR"
. tst_test.sh
+setup()
meta/recipes-extended/ltp/ltp/define-sigrtmin-and-sigrtmax-for-musl.patch
+114
View File
@@ -0,0 +1,114 @@
From 34b91edc70709f32b44f6b3a32c8f18db393e36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
Date: Wed, 20 Feb 2019 08:07:27 -0600
Subject: [PATCH] Define __SIGRTMIN and __SIGRTMAX for MUSL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some libc implementations might differ in the definitions they
include. Exempli gratia: MUSL does not define __SIGRTMAX nor
__SIGRTMIN.
These two tests fail to build because of the missing
definitions:
testcases/kernel/syscalls/ptrace/ptrace05.c
testcases/kernel/syscalls/sighold/sighold02.c
Out of precaution, these two also include this header:
lib/tst_sig.c
testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2019-February/010916.html]
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
---
include/lapi/signal.h | 24 +++++++++++++++++++
lib/tst_sig.c | 1 +
testcases/kernel/syscalls/ptrace/ptrace05.c | 1 +
.../syscalls/rt_sigsuspend/rt_sigsuspend01.c | 1 +
testcases/kernel/syscalls/sighold/sighold02.c | 1 +
5 files changed, 28 insertions(+)
create mode 100644 include/lapi/signal.h
diff --git a/include/lapi/signal.h b/include/lapi/signal.h
new file mode 100644
index 000000000..d22965a94
--- /dev/null
+++ b/include/lapi/signal.h
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2019 Linaro Limited. All rights reserved.
+ * Author: Daniel Díaz <daniel.diaz@linaro.org>
+ */
+
+#ifndef LAPI_SIGNAL_H
+#define LAPI_SIGNAL_H
+
+#include <signal.h>
+
+/*
+ * Some libc implementations might differ in the definitions they include. This
+ * covers those differences for all tests to successfully build.
+ */
+
+#ifndef __SIGRTMIN
+# define __SIGRTMIN 32
+#endif
+#ifndef __SIGRTMAX
+# define __SIGRTMAX (_NSIG - 1)
+#endif
+
+#endif
diff --git a/lib/tst_sig.c b/lib/tst_sig.c
index 36565e13d..6d77aeafd 100644
--- a/lib/tst_sig.c
+++ b/lib/tst_sig.c
@@ -72,6 +72,7 @@
#include <signal.h>
#include <unistd.h>
#include "test.h"
+#include "lapi/signal.h"
#define MAXMESG 150 /* size of mesg string sent to tst_res */
diff --git a/testcases/kernel/syscalls/ptrace/ptrace05.c b/testcases/kernel/syscalls/ptrace/ptrace05.c
index 420330029..54cfa4d7b 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace05.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace05.c
@@ -38,6 +38,7 @@
#include "ptrace.h"
#include "test.h"
+#include "lapi/signal.h"
char *TCID = "ptrace05";
int TST_TOTAL = 0;
diff --git a/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c b/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
index f17a9aae6..e577cf227 100644
--- a/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
+++ b/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
@@ -18,6 +18,7 @@
#include "tst_test.h"
#include "lapi/syscalls.h"
#include "lapi/safe_rt_signal.h"
+#include "lapi/signal.h"
static void sig_handler(int sig)
{
diff --git a/testcases/kernel/syscalls/sighold/sighold02.c b/testcases/kernel/syscalls/sighold/sighold02.c
index d1d4b0b06..b763142df 100644
--- a/testcases/kernel/syscalls/sighold/sighold02.c
+++ b/testcases/kernel/syscalls/sighold/sighold02.c
@@ -49,6 +49,7 @@
#include <sys/wait.h>
#include "test.h"
#include "safe_macros.h"
+#include "lapi/signal.h"
/* _XOPEN_SOURCE disables NSIG */
#ifndef NSIG
--
2.17.1
meta/recipes-extended/ltp/ltp_20180926.bb → meta/recipes-extended/ltp/ltp_20190115.bb
+4 -7
View File
@@ -27,7 +27,7 @@ CFLAGS_append_x86-64 = " -fomit-frame-pointer"
CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
SRCREV = "f424769b1ad9fca477118763f88a6cec98ea2c0a"
SRCREV = "a6a5caef13632e669dda27b0461726eba546a2f3"
SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0004-build-Add-option-to-select-libc-implementation.patch \
@@ -46,13 +46,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0035-fix-test_proc_kill-hang.patch \
file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \
file://0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch \
file://0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch \
file://0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch \
file://0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
file://0001-statx-fix-compile-errors.patch \
file://0001-setrlimit05-Use-another-method-to-get-bad-address.patch \
file://0001-getcpu01-Rename-getcpu-to-avoid-conflict-with-glibc-.patch \
file://define-sigrtmin-and-sigrtmax-for-musl.patch \
"
S = "${WORKDIR}/git"
@@ -96,6 +91,7 @@ RDEPENDS_${PN} = "\
curl \
e2fsprogs-mke2fs \
expect \
file \
gawk \
gzip \
iproute2 \
@@ -105,6 +101,7 @@ RDEPENDS_${PN} = "\
perl \
python-core \
procps \
quota \
unzip \
util-linux \
which \