aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Liaw <edliaw@google.com>2022-03-25 23:10:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-25 23:10:27 +0000
commit962b84dcdcf9d744c5dd45e8f1ecfda6e4f0fc5d (patch)
tree8acd0fd4a524e7ff2b4bb92e7bb3c85625713389
parentead0ec0dbf435aa18742d7e162f19d9e886ae95e (diff)
parentbf341cc0aefa4037102843e5696d3a02e17e03d5 (diff)
downloadltp-962b84dcdcf9d744c5dd45e8f1ecfda6e4f0fc5d.tar.gz
ltp: statx07 quote tmpdir in sh command am: 887768b3e2 am: bf341cc0ae
Original change: https://android-review.googlesource.com/c/platform/external/ltp/+/2043183 Change-Id: I9c4240a6c3fb83a1ca14604e7e2d771f51f00b17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--android/tools/disabled_tests.txt3
-rw-r--r--testcases/kernel/syscalls/statx/statx07.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/android/tools/disabled_tests.txt b/android/tools/disabled_tests.txt
index a291b66f2..4f167ea01 100644
--- a/android/tools/disabled_tests.txt
+++ b/android/tools/disabled_tests.txt
@@ -476,6 +476,9 @@ testcases/bin/fs_bind/regression/test03
# Depends on CONFIG_EXT4_FS_ENCRYPTION which is not required on Android.
# b/123523766
statx05
+# Depends on exportfs (NFS not supported on Android).
+# b/191236106
+statx07
# Disabled from LTP20190517
# b/136666217
diff --git a/testcases/kernel/syscalls/statx/statx07.c b/testcases/kernel/syscalls/statx/statx07.c
index ec1cdd190..9f361eb02 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");