diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-25 18:04:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-25 18:04:02 +0000 |
commit | f7fd3367667dc51a38dc0dac846c998dc463f53b (patch) | |
tree | 71638c41337c7dbb17d3e68d268daca4e2ac8ab4 | |
parent | b6c48aedd7be323f81e07a6b639c9cedff275533 (diff) | |
parent | 76a9eb4374ac17ab9d1f5967806e2c455b55adb6 (diff) | |
download | core-f7fd3367667dc51a38dc0dac846c998dc463f53b.tar.gz |
Merge "vts_fs_test: Do not check /metadata for automotive" into android14-tests-dev am: 76a9eb4374
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2800753
Change-Id: Iae65c56e03a953101358290a1e27b9c731a121cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | fs_mgr/tests/vts_fs_test.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/fs_mgr/tests/vts_fs_test.cpp b/fs_mgr/tests/vts_fs_test.cpp index 4d771fa04..bf003eef7 100644 --- a/fs_mgr/tests/vts_fs_test.cpp +++ b/fs_mgr/tests/vts_fs_test.cpp @@ -30,6 +30,24 @@ static int GetVsrLevel() { return android::base::GetIntProperty("ro.vendor.api_level", -1); } +// Returns true iff the device has the specified feature. +bool DeviceSupportsFeature(const char* feature) { + bool device_supports_feature = false; + FILE* p = popen("pm list features", "re"); + if (p) { + char* line = NULL; + size_t len = 0; + while (getline(&line, &len, p) > 0) { + if (strstr(line, feature)) { + device_supports_feature = true; + break; + } + } + pclose(p); + } + return device_supports_feature; +} + TEST(fs, ErofsSupported) { // T-launch GKI kernels and higher must support EROFS. if (GetVsrLevel() < __ANDROID_API_T__) { @@ -80,7 +98,8 @@ TEST(fs, PartitionTypes) { ASSERT_TRUE(android::base::Readlink("/dev/block/by-name/userdata", &userdata_bdev)); std::vector<std::string> must_be_f2fs = {"/data"}; - if (vsr_level >= __ANDROID_API_U__) { + if (vsr_level >= __ANDROID_API_U__ && + !DeviceSupportsFeature("android.hardware.type.automotive")) { must_be_f2fs.emplace_back("/metadata"); } |