diff options
| author | Edward Liaw <edliaw@google.com> | 2022-04-14 18:04:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-14 18:04:06 +0000 |
| commit | 38b0fca7bd1ee8eef2eea786153eafe5d08c096b (patch) | |
| tree | cf672dc76b5b8bf1e16da080c414b6cbce6c0bf2 | |
| parent | 3f0a5c513345d7d3eacf214f2603506fb945ccb0 (diff) | |
| parent | f68f4cfe32a9ee7f71a118f28cd90833089271d8 (diff) | |
| download | ltp-38b0fca7bd1ee8eef2eea786153eafe5d08c096b.tar.gz | |
Merge changes I972bb7ac,I8b286cc2 am: f42e2171dc am: 07b0136193 am: f68f4cfe32
Original change: https://android-review.googlesource.com/c/platform/external/ltp/+/2063207
Change-Id: Ic30dfbc58a6b0f6b8fa847cef5f0edea86ba4ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | lib/tst_test.c | 4 | ||||
| -rw-r--r-- | testcases/kernel/syscalls/statx/statx07.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/tst_test.c b/lib/tst_test.c index 36a4809c7..55449c80b 100644 --- a/lib/tst_test.c +++ b/lib/tst_test.c @@ -915,7 +915,7 @@ static void do_setup(int argc, char *argv[]) assert_test_fn(); - tid = get_tid(argv); + TCID = tid = get_tid(argv); if (tst_test->sample) tst_test = tst_timer_test_setup(tst_test); @@ -1412,8 +1412,6 @@ void tst_run_tcases(int argc, char *argv[], struct tst_test *self) do_setup(argc, argv); - TCID = tid; - SAFE_SIGNAL(SIGALRM, alarm_handler); SAFE_SIGNAL(SIGUSR1, heartbeat_handler); diff --git a/testcases/kernel/syscalls/statx/statx07.c b/testcases/kernel/syscalls/statx/statx07.c index 9f361eb02..ec1cdd190 100644 --- a/testcases/kernel/syscalls/statx/statx07.c +++ b/testcases/kernel/syscalls/statx/statx07.c @@ -133,7 +133,7 @@ static void setup(void) snprintf(server_path, sizeof(server_path), ":%s/%s", cwd, SERV_PATH); snprintf(cmd, sizeof(cmd), - "exportfs -i -o no_root_squash,rw,sync,no_subtree_check,fsid=%d \"*%.1024s\"", + "exportfs -i -o no_root_squash,rw,sync,no_subtree_check,fsid=%d *%.1024s", getpid(), server_path); exported = 1; @@ -157,7 +157,7 @@ static void cleanup(void) if (!exported) return; snprintf(cmd, sizeof(cmd), - "exportfs -u *:\"%s/%s\"", cwd, SERV_PATH); + "exportfs -u *:%s/%s", cwd, SERV_PATH); if (tst_system(cmd) == -1) tst_res(TWARN | TST_ERR, "failed to clear exportfs"); |