From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steve Muckle Date: Wed, 26 Dec 2018 16:31:00 -0800 Subject: [LTP] [PATCH 1/3] getrlimit/getrlimit03: fix breakage with Aarch32 Message-ID: <20181227003102.246617-1-smuckle@google.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ltp@lists.linux.it A 64-bit ARM kernel running an Aarch32 user binary has the ugetrlimit and prlimit64 syscalls, but not the getrlimit syscall. This test currently assumes getrlimit is always available. Modify the test so that it does not fail in this configuration. Signed-off-by: Steve Muckle --- testcases/kernel/syscalls/getrlimit/getrlimit03.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit03.c b/testcases/kernel/syscalls/getrlimit/getrlimit03.c index 376ef7241..53a1e2c5d 100644 --- a/testcases/kernel/syscalls/getrlimit/getrlimit03.c +++ b/testcases/kernel/syscalls/getrlimit/getrlimit03.c @@ -158,10 +158,15 @@ static void run(unsigned int resource) "rlim_max")) return; + tst_res(TPASS, "__NR_prlimit64(%d) and %s(%d) gave consistent results", + resource, __NR_getrlimit_ulong_str, resource); + #if SIGNED_GETRLIMIT errno = 0; ret_l = getrlimit_long(resource, &rlim_l); errno_l = errno; + if (errno_l == ENOSYS) + return; if (compare_retval(resource, ret_u64, errno_u64, ret_l, errno_l, "__NR_getrlimit") || @@ -170,10 +175,10 @@ static void run(unsigned int resource) compare_u64_long(resource, rlim_u64.rlim_max, rlim_l.rlim_max, "rlim_max")) return; -#endif - tst_res(TPASS, "getrlimit(%u) was consistent during all syscalls", - resource); + tst_res(TPASS, "__NR_prlimit64(%d) and __NR_getrlimit(%d) gave " + "consistent results", resource, resource); +#endif } static struct tst_test test = { -- 2.20.1.415.g653613c723-goog