diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-18 01:40:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 01:40:52 +0000 |
| commit | 3766adbe71601a7325268a64b6216cc791398f3e (patch) | |
| tree | 8b9c4dfc348ca5779ee6b944325581e97c78b78a | |
| parent | 2a13b7074572f4489e0a3839794e6f22c26dd46e (diff) | |
| parent | 159112f23d727c603040edf9fd6a034425fd3832 (diff) | |
| download | platform_external_ltp-android11-gsi.tar.gz platform_external_ltp-android11-gsi.tar.bz2 platform_external_ltp-android11-gsi.zip | |
Snap for 6601700 from 8744c0f080ee202280898aec4a5283535117b923 to rvc-release am: 159112f23dandroid11-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ltp/+/11903030
Change-Id: Ib563609811dd8247a5313647f7428a83ffc3a6cf
| -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"); |