commit 0f7b66b604ab9db1ef31d6eeb5ffdf74de572000
author David Anderson <dvander@google.com> Thu Jul 14 17:33:08 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 14 17:33:08 2022 +0000
tree d86e01545fc6103bde2d5e597b252cbc1bedbb1c
parent 2b0c119bff5bfe43a9b711547faabee5eaafc9b6
parent c2f95c4b793a6b6eaccf7840b05327eec33475a7

Merge changes I29453595,I6586c8e5

* changes:
  vts_fs_test: Only require EROFS in T+ kernels.
  Revert "Do not enforce EROFS for android-T and below."

fs_mgr/tests/vts_fs_test.cpp

diff --git a/fs_mgr/tests/vts_fs_test.cpp b/fs_mgr/tests/vts_fs_test.cpp
index 3f12103..ae8e459 100644
--- a/fs_mgr/tests/vts_fs_test.cpp
+++ b/fs_mgr/tests/vts_fs_test.cpp
@@ -28,8 +28,8 @@
 }
 
 TEST(fs, ErofsSupported) {
-    // U and higher for this test.
-    if (GetVsrLevel() <= __ANDROID_API_T__) {
+    // T-launch GKI kernels and higher must support EROFS.
+    if (GetVsrLevel() < __ANDROID_API_T__) {
         GTEST_SKIP();
     }