From 97038a2c7c9373bdb39d79ab413a7b1687068cfb Mon Sep 17 00:00:00 2001
From: Alan Stokes <alanstokes@google.com>
Date: Tue, 11 Apr 2023 16:08:36 +0100
Subject: [PATCH] Re-enable Compos test cases

Also move all the AVF related tests to avf-presubmit, so they run on
real devices.

Partially reverts commit 26dcfc54164ba69fe30925245355efe06537c4e7,
now that the test is disabled on Cuttlefish.

Bug: 264496291
Test: Presubmit
Change-Id: Ic9ac7bd33d7fa3b23e67fc29f8d9c1658db618b8
---
 TEST_MAPPING | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 41480026a..9aa510bdc 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -16,14 +16,14 @@
                     "include-filter": "android.security.cts.SeamendcHostTest"
                 }
             ]
+        }
+    ],
+    "avf-presubmit": [
+        {
+            "name": "ComposHostTestCases"
         },
         {
             "name": "MicrodroidHostTestCases"
         }
-    ],
-    "avf-postsubmit": [
-        {
-            "name": "ComposHostTestCases"
-        }
     ]
 }