diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-17 00:46:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-17 00:46:30 +0000 |
| commit | 8744c0f080ee202280898aec4a5283535117b923 (patch) | |
| tree | 8b9c4dfc348ca5779ee6b944325581e97c78b78a | |
| parent | a9db589624fd48bd096562e82051c2800fa967a6 (diff) | |
| parent | 6dc24f963dd9387cf3f2067dd12889b1d2d3598c (diff) | |
| download | platform_external_ltp-android11-tests-dev.tar.gz platform_external_ltp-android11-tests-dev.tar.bz2 platform_external_ltp-android11-tests-dev.zip | |
Merge "syscalls/mknod07: whiteout creation no longer requires privileges" into rvc-devandroid11-tests-releaseandroid11-tests-devandroid11-dev
| -rw-r--r-- | testcases/kernel/syscalls/mknod/mknod07.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/testcases/kernel/syscalls/mknod/mknod07.c b/testcases/kernel/syscalls/mknod/mknod07.c index 69cff02d9..829199061 100644 --- a/testcases/kernel/syscalls/mknod/mknod07.c +++ b/testcases/kernel/syscalls/mknod/mknod07.c @@ -43,6 +43,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/mount.h> +#include <sys/sysmacros.h> #include "test.h" #include "safe_macros.h" @@ -69,13 +70,14 @@ static struct test_case_t { char *pathname; int mode; int exp_errno; + int major, minor; } test_cases[] = { - { "testdir_1/tnode_1", SOCKET_MODE, EACCES }, - { "testdir_1/tnode_2", FIFO_MODE, EACCES }, - { "tnode_3", CHR_MODE, EPERM }, - { "tnode_4", BLK_MODE, EPERM }, - { "mntpoint/tnode_5", SOCKET_MODE, EROFS }, - { elooppathname, FIFO_MODE, ELOOP }, + { "testdir_1/tnode_1", SOCKET_MODE, EACCES, 0, 0 }, + { "testdir_1/tnode_2", FIFO_MODE, EACCES, 0, 0 }, + { "tnode_3", CHR_MODE, EPERM, 1, 3 }, + { "tnode_4", BLK_MODE, EPERM, 0, 0 }, + { "mntpoint/tnode_5", SOCKET_MODE, EROFS, 0, 0 }, + { elooppathname, FIFO_MODE, ELOOP, 0, 0 }, }; char *TCID = "mknod07"; @@ -149,7 +151,8 @@ static void setup(void) static void mknod_verify(const struct test_case_t *test_case) { - TEST(mknod(test_case->pathname, test_case->mode, 0)); + TEST(mknod(test_case->pathname, test_case->mode, + makedev(test_case->major, test_case->minor))); if (TEST_RETURN != -1) { tst_resm(TFAIL, "mknod succeeded unexpectedly"); |