aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Balsini <balsini@google.com>2021-12-22 07:58:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-22 07:58:51 +0000
commit798b71268a7116e563a8f717599fbd4d1287c2da (patch)
tree073e87a438ed5891eb6823e690c0f426de03032d
parentc78035e0e2c42d94d8024fa5b5569388efba8773 (diff)
parent217c48f86632f67b217e5ecca6c6c5f6403d26da (diff)
downloadltp-798b71268a7116e563a8f717599fbd4d1287c2da.tar.gz
Android fsstress target am: b4c08af0b9 am: 01b5872115 am: 21dab7f56f am: 217c48f866
Original change: https://android-review.googlesource.com/c/platform/external/ltp/+/1931079 Change-Id: I8368be1c2d19d98810dc757e11ce2f79936d8168
-rw-r--r--android/ltp_package_list.mk1
-rw-r--r--android/tools/disabled_tests.txt3
-rw-r--r--gen.bp16
3 files changed, 17 insertions, 3 deletions
diff --git a/android/ltp_package_list.mk b/android/ltp_package_list.mk
index 8a6e5da90..284c25c18 100644
--- a/android/ltp_package_list.mk
+++ b/android/ltp_package_list.mk
@@ -451,6 +451,7 @@ ltp_packages := \
ltp_fsopen02 \
ltp_fspick01 \
ltp_fspick02 \
+ ltp_fsstress \
ltp_fstat02 \
ltp_fstat02_64 \
ltp_fstat03 \
diff --git a/android/tools/disabled_tests.txt b/android/tools/disabled_tests.txt
index 357e8ca85..a291b66f2 100644
--- a/android/tools/disabled_tests.txt
+++ b/android/tools/disabled_tests.txt
@@ -366,9 +366,6 @@ in6_01
# bionic doesn't expose resolver routines to the public
mc_gethost
-# Actually two conflicting tests with the same name (upstream bug)
-fsstress
-
# Require mkfifo
gf12
gf13
diff --git a/gen.bp b/gen.bp
index 0f353d106..22a5db8c6 100644
--- a/gen.bp
+++ b/gen.bp
@@ -5074,6 +5074,22 @@ cc_test {
}
cc_test {
+ name: "ltp_fsstress",
+ stem: "fsstress",
+ defaults: ["ltp_test_defaults"],
+ srcs: ["testcases/kernel/fs/fsstress/fsstress.c"],
+ cflags: [
+ "-DNO_XFS",
+ "-D_GNU_SOURCE",
+ "-D_LARGEFILE64_SOURCE",
+ ],
+ local_include_dirs: [
+ "include/old",
+ "testcases/kernel/fs/fsstress",
+ ],
+}
+
+cc_test {
name: "ltp_fstat02",
stem: "fstat02",
defaults: ["ltp_test_defaults"],