Merge "syscalls/mkdir03: convert to new API and use .needsrofs for EROFS check"
diff --git a/android/ltp_package_list.mk b/android/ltp_package_list.mk
index ecaa910..fa59f25 100644
--- a/android/ltp_package_list.mk
+++ b/android/ltp_package_list.mk
@@ -539,7 +539,6 @@
ltp_ksm03 \
ltp_ksm04 \
ltp_ksm06 \
- ltp_leapsec_timer \
ltp_lftest \
ltp_lgetxattr01 \
ltp_lgetxattr02 \
@@ -815,6 +814,10 @@
ltp_preadv02_64 \
ltp_print_caps \
ltp_proc01 \
+ ltp_process_vm01 \
+ ltp_process_vm_readv02 \
+ ltp_process_vm_readv03 \
+ ltp_process_vm_writev02 \
ltp_pselect01 \
ltp_pselect01_64 \
ltp_pselect02 \
diff --git a/android/tools/disabled_tests.txt b/android/tools/disabled_tests.txt
index f33acd2..2eef05e 100644
--- a/android/tools/disabled_tests.txt
+++ b/android/tools/disabled_tests.txt
@@ -76,10 +76,6 @@
msgsnd04
msgsnd05
msgsnd06
-process_vm01
-process_vm_readv02
-process_vm_readv03
-process_vm_writev02
remap_file_pages01
remap_file_pages02
sem01
@@ -512,3 +508,8 @@
setresgid01
chown03
setgroups04
+
+# TODO b/69263988
+# The leapsec timer test relies on manipulations of the system time
+# which may be disrupted if the device is configured to use network time.
+leapsec_timer
diff --git a/android/tools/dump_make_dryrun.sh b/android/tools/dump_make_dryrun.sh
index 59f030f..e06d44a 100755
--- a/android/tools/dump_make_dryrun.sh
+++ b/android/tools/dump_make_dryrun.sh
@@ -32,4 +32,7 @@
echo "Dumping output to $OUTPUT from command 'make -C $LTP_ROOT/testcases install --dry-run'"
make -C $LTP_ROOT/testcases install --dry-run > $OUTPUT
-echo "Finished!"
\ No newline at end of file
+echo "Distclean $LTP_ROOT ..."
+make -C $LTP_ROOT distclean
+
+echo "Finished!"
diff --git a/gen.bp b/gen.bp
index 880d696..e9098cb 100644
--- a/gen.bp
+++ b/gen.bp
@@ -2208,6 +2208,15 @@
}
cc_test {
+ name: "ltp_process_vm_writev02",
+ stem: "process_vm_writev02",
+ defaults: ["ltp_test_defaults"],
+ srcs: ["testcases/kernel/syscalls/cma/process_vm_writev02.c"],
+ local_include_dirs: ["include/old"],
+ static_libs: ["libltp_ltp"],
+}
+
+cc_test {
name: "ltp_vma02",
stem: "vma02",
defaults: ["ltp_test_defaults"],
@@ -2618,6 +2627,15 @@
}
cc_test {
+ name: "ltp_process_vm01",
+ stem: "process_vm01",
+ defaults: ["ltp_test_defaults"],
+ srcs: ["testcases/kernel/syscalls/cma/process_vm01.c"],
+ local_include_dirs: ["include/old"],
+ static_libs: ["libltp_ltp"],
+}
+
+cc_test {
name: "ltp_inotify01",
stem: "inotify01",
defaults: ["ltp_test_defaults"],
@@ -3049,18 +3067,6 @@
}
cc_test {
- name: "ltp_leapsec_timer",
- stem: "leapsec_timer",
- defaults: ["ltp_test_defaults"],
- srcs: ["testcases/kernel/timers/leapsec/leapsec_timer.c"],
- local_include_dirs: [
- "testcases/kernel/timers/include",
- "include/old",
- ],
- static_libs: ["libltp_ltp"],
-}
-
-cc_test {
name: "ltp_nice02",
stem: "nice02",
defaults: ["ltp_test_defaults"],
@@ -7659,6 +7665,24 @@
}
cc_test {
+ name: "ltp_process_vm_readv03",
+ stem: "process_vm_readv03",
+ defaults: ["ltp_test_defaults"],
+ srcs: ["testcases/kernel/syscalls/cma/process_vm_readv03.c"],
+ local_include_dirs: ["include/old"],
+ static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+ name: "ltp_process_vm_readv02",
+ stem: "process_vm_readv02",
+ defaults: ["ltp_test_defaults"],
+ srcs: ["testcases/kernel/syscalls/cma/process_vm_readv02.c"],
+ local_include_dirs: ["include/old"],
+ static_libs: ["libltp_ltp"],
+}
+
+cc_test {
name: "ltp_cve-2016-7117",
stem: "cve-2016-7117",
defaults: ["ltp_test_defaults"],
diff --git a/testcases/kernel/syscalls/cma/process_vm.h b/testcases/kernel/syscalls/cma/process_vm.h
index 7df9aac..1ecf325 100644
--- a/testcases/kernel/syscalls/cma/process_vm.h
+++ b/testcases/kernel/syscalls/cma/process_vm.h
@@ -59,42 +59,4 @@
#endif
}
-void safe_semop(int id, unsigned short num, short op)
-{
- int ret;
- struct sembuf sem_op;
- sem_op.sem_num = num,
- sem_op.sem_op = op,
- sem_op.sem_flg = 0;
-
- do {
- ret = semop(id, &sem_op, 1);
- } while (ret == -1 && errno == EINTR);
- if (ret == -1)
- tst_brkm(TBROK|TERRNO, NULL, "semop(%d, (%d, %d)) failed",
- id, num, op);
-}
-
-int init_sem(int num)
-{
- int id, i;
- union semun u;
- if ((id = semget(IPC_PRIVATE, num, IPC_CREAT|S_IRWXU)) == -1)
- tst_brkm(TBROK|TERRNO, NULL, "Couldn't allocate semaphore");
-
- for (i = 0; i < num; i++) {
- u.val = 0;
- if (semctl(id, 0, SETVAL, u) == -1)
- tst_brkm(TBROK|TERRNO, NULL,
- "Couldn't initialize sem %d value", i);
- }
- return id;
-}
-
-void clean_sem(int id)
-{
- if (semctl(id, 0, IPC_RMID) == -1)
- tst_brkm(TBROK|TERRNO, NULL, "Couldn't remove sem");
-}
-
#endif /* _PROCESS_VM_H_ */
diff --git a/testcases/kernel/syscalls/cma/process_vm_readv02.c b/testcases/kernel/syscalls/cma/process_vm_readv02.c
index b7dd9b2..32ce8fc 100644
--- a/testcases/kernel/syscalls/cma/process_vm_readv02.c
+++ b/testcases/kernel/syscalls/cma/process_vm_readv02.c
@@ -38,7 +38,6 @@
static int len;
static int pipe_fd[2];
static pid_t pids[2];
-static int semid;
static void child_alloc(void);
static void child_invoke(void);
@@ -86,7 +85,7 @@
tst_resm(TFAIL, "child 1 returns %d", status);
/* child_alloc is free to exit now */
- safe_semop(semid, 0, 1);
+ TST_SAFE_CHECKPOINT_WAKE(cleanup, 0);
if (waitpid(pids[0], &status, 0) == -1)
tst_brkm(TBROK | TERRNO, cleanup, "waitpid");
@@ -115,7 +114,7 @@
SAFE_CLOSE(tst_exit, pipe_fd[1]);
/* wait until child_invoke is done reading from our VM */
- safe_semop(semid, 0, -1);
+ TST_SAFE_CHECKPOINT_WAIT(cleanup, 0);
}
static void child_invoke(void)
@@ -156,12 +155,13 @@
tst_brkm(TCONF, NULL, "process_vm_readv does not exist "
"on your system");
#endif
- semid = init_sem(1);
+ tst_tmpdir();
+ TST_CHECKPOINT_INIT(cleanup);
TEST_PAUSE;
}
static void cleanup(void)
{
- clean_sem(semid);
+ tst_rmdir();
}
diff --git a/testcases/kernel/syscalls/cma/process_vm_readv03.c b/testcases/kernel/syscalls/cma/process_vm_readv03.c
index 17f0a5d..0535e85 100644
--- a/testcases/kernel/syscalls/cma/process_vm_readv03.c
+++ b/testcases/kernel/syscalls/cma/process_vm_readv03.c
@@ -51,7 +51,6 @@
static long bufsz;
static int pipe_fd[2];
static pid_t pids[2];
-static int semid;
static void gen_random_arr(int *arr, int arr_sz);
static void child_alloc(int *bufsz_arr);
@@ -105,7 +104,7 @@
tst_resm(TFAIL, "child 1 returns %d", status);
/* child_alloc is free to exit now */
- safe_semop(semid, 0, 1);
+ TST_SAFE_CHECKPOINT_WAKE(cleanup, 0);
if (waitpid(pids[0], &status, 0) == -1)
tst_brkm(TBROK | TERRNO, cleanup, "waitpid");
@@ -160,7 +159,7 @@
SAFE_CLOSE(tst_exit, pipe_fd[1]);
/* wait until child_invoke is done reading from our VM */
- safe_semop(semid, 0, -1);
+ TST_SAFE_CHECKPOINT_WAIT(cleanup, 0);
}
static long *fetch_remote_addrs(void)
@@ -258,7 +257,8 @@
tst_brkm(TCONF, NULL, "process_vm_readv does not exist "
"on your system");
#endif
- semid = init_sem(1);
+ tst_tmpdir();
+ TST_CHECKPOINT_INIT(cleanup);
srand(time(NULL));
TEST_PAUSE;
@@ -266,7 +266,7 @@
static void cleanup(void)
{
- clean_sem(semid);
+ tst_rmdir();
}
static void help(void)
diff --git a/testcases/kernel/syscalls/cma/process_vm_writev02.c b/testcases/kernel/syscalls/cma/process_vm_writev02.c
index 04cf6d1..9e8bfe1 100644
--- a/testcases/kernel/syscalls/cma/process_vm_writev02.c
+++ b/testcases/kernel/syscalls/cma/process_vm_writev02.c
@@ -48,7 +48,6 @@
static long bufsz;
static int pipe_fd[2];
static pid_t pids[2];
-static int semid;
static void child_init_and_verify(void);
static void child_write(void);
@@ -99,7 +98,7 @@
tst_resm(TFAIL, "child 1 returns %d", status);
/* signal child_init_and_verify to verify its VM now */
- safe_semop(semid, 0, 1);
+ TST_SAFE_CHECKPOINT_WAKE(cleanup, 0);
if (waitpid(pids[0], &status, 0) == -1)
tst_brkm(TBROK | TERRNO, cleanup, "waitpid");
@@ -129,7 +128,7 @@
SAFE_CLOSE(tst_exit, pipe_fd[1]);
/* wait until child_write() is done writing to our VM */
- safe_semop(semid, 0, -1);
+ TST_SAFE_CHECKPOINT_WAIT(cleanup, 0);
nr_err = 0;
for (i = 0; i < bufsz; i++) {
@@ -192,14 +191,15 @@
tst_brkm(TCONF, NULL, "process_vm_writev does not exist "
"on your system");
#endif
- semid = init_sem(1);
+ tst_tmpdir();
+ TST_CHECKPOINT_INIT(cleanup);
TEST_PAUSE;
}
static void cleanup(void)
{
- clean_sem(semid);
+ tst_rmdir();
}
static void help(void)
