| Message ID | 20181106161126.251484-2-sspatil@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | Misc cleanup (new lib) and fixes for Android | expand |
On Tue, Nov 06, 2018 at 08:11:25AM -0800, Sandeep Patil wrote: > This makes the test work successfully on Android systems where > "users" group doesn't exist. > > Signed-off-by: Sandeep Patil <sspatil@google.com> > --- > testcases/kernel/syscalls/fchmod/fchmod02.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/testcases/kernel/syscalls/fchmod/fchmod02.c b/testcases/kernel/syscalls/fchmod/fchmod02.c > index d0b35db12..e60cb33a6 100644 > --- a/testcases/kernel/syscalls/fchmod/fchmod02.c > +++ b/testcases/kernel/syscalls/fchmod/fchmod02.c > @@ -22,9 +22,6 @@ > #include "tst_test.h" > #include "fchmod.h" > > -#define LTPUSER "nobody" > -#define LTPGRP "users" > - > static int fd; > > static void verify_fchmod(void) > @@ -53,8 +50,8 @@ static void setup(void) > struct passwd *ltpuser; > struct group *ltpgroup; > > - ltpuser = SAFE_GETPWNAM(LTPUSER); > - ltpgroup = SAFE_GETGRNAM(LTPGRP); > + ltpuser = SAFE_GETPWNAM("nobody"); > + ltpgroup = SAFE_GETGRNAM_FALLBACK("users", "daemon"); > > fd = SAFE_OPEN(TESTFILE, O_RDWR | O_CREAT, FILE_MODE); > SAFE_CHOWN(TESTFILE, ltpuser->pw_uid, ltpgroup->gr_gid); > -- > 2.19.1.930.g4563a0d9d0-goog > (Ignore, this has been merged now)
diff --git a/testcases/kernel/syscalls/fchmod/fchmod02.c b/testcases/kernel/syscalls/fchmod/fchmod02.c index d0b35db12..e60cb33a6 100644 --- a/testcases/kernel/syscalls/fchmod/fchmod02.c +++ b/testcases/kernel/syscalls/fchmod/fchmod02.c @@ -22,9 +22,6 @@ #include "tst_test.h" #include "fchmod.h" -#define LTPUSER "nobody" -#define LTPGRP "users" - static int fd; static void verify_fchmod(void) @@ -53,8 +50,8 @@ static void setup(void) struct passwd *ltpuser; struct group *ltpgroup; - ltpuser = SAFE_GETPWNAM(LTPUSER); - ltpgroup = SAFE_GETGRNAM(LTPGRP); + ltpuser = SAFE_GETPWNAM("nobody"); + ltpgroup = SAFE_GETGRNAM_FALLBACK("users", "daemon"); fd = SAFE_OPEN(TESTFILE, O_RDWR | O_CREAT, FILE_MODE); SAFE_CHOWN(TESTFILE, ltpuser->pw_uid, ltpgroup->gr_gid);
This makes the test work successfully on Android systems where "users" group doesn't exist. Signed-off-by: Sandeep Patil <sspatil@google.com> --- testcases/kernel/syscalls/fchmod/fchmod02.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)