setpriority01: Skip only PRIO_USER when unable to add test user
We don't need to skip all the tests just because we are unable to add
a test user. Not having a test user only affects PRIO_USER test case.
So just skip that one and continue running the rest of the tests when
useradd is not available or can't write to /etc/passwd (Eg: read-only
filesystem)
If useradd is present and it still fails for other reasons, then
consider it an error in the test preparation phase.
This also allows this test case to be built and run on Android.
Signed-off-by: Saravana Kannan <saravanak@google.com>
Acked-by: Cyril Hrubis <chrubis@suse.cz>
(cherry picked from commit db82b596ccfb08470f2f5bf19b3d9cee7b2e1a9e)
Bug: 112484634
Change-Id: Id9c993125a22792a161c0b7e639694486492f390
Test: run vts-kernel -m VtsKernelLtp
Signed-off-by: Steve Muckle <smuckle@google.com>
diff --git a/testcases/kernel/syscalls/setpriority/Makefile b/testcases/kernel/syscalls/setpriority/Makefile
index 5d00984..7a1a87a 100644
--- a/testcases/kernel/syscalls/setpriority/Makefile
+++ b/testcases/kernel/syscalls/setpriority/Makefile
@@ -19,9 +19,4 @@
top_srcdir ?= ../../../..
include $(top_srcdir)/include/mk/testcases.mk
-
-ifeq ($(ANDROID), 1)
-FILTER_OUT_MAKE_TARGETS += setpriority01
-endif
-
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/setpriority/setpriority01.c b/testcases/kernel/syscalls/setpriority/setpriority01.c
index 38b77b7..b93a42a 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority01.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority01.c
@@ -92,9 +92,16 @@
{
struct tcase *tc = &tcases[n];
+ if (tc->which == PRIO_USER && !user_added) {
+ tst_res(TCONF, "setpriority(%s(%d), %d, -20..19) skipped - Can't add user",
+ str_which(tc->which), tc->which, *tc->who);
+ return;
+ }
+
pid = SAFE_FORK();
if (pid == 0) {
- SAFE_SETUID(uid);
+ if (user_added)
+ SAFE_SETUID(uid);
SAFE_SETPGID(0, 0);
TST_CHECKPOINT_WAKE_AND_WAIT(0);
@@ -115,15 +122,20 @@
{
const char *const cmd_useradd[] = {"useradd", username, NULL};
struct passwd *ltpuser;
+ int rc;
- if (eaccess("/etc/passwd", W_OK))
- tst_brk(TCONF, "/etc/passwd is not accessible");
-
- tst_run_cmd(cmd_useradd, NULL, NULL, 0);
- user_added = 1;
-
- ltpuser = SAFE_GETPWNAM(username);
- uid = ltpuser->pw_uid;
+ switch ((rc = tst_run_cmd(cmd_useradd, NULL, NULL, 1))) {
+ case 0:
+ user_added = 1;
+ ltpuser = SAFE_GETPWNAM(username);
+ uid = ltpuser->pw_uid;
+ return;
+ case 1:
+ case 255:
+ return;
+ default:
+ tst_brk(TBROK, "Useradd failed (%d)", rc);
+ }
}
static void cleanup(void)