commit fdbe207596c11cf84c23855123d87ea6e15b70ff
author Roland Levillain <rpl@google.com> Mon Nov 11 15:52:45 2019 +0000
committer Roland Levillain <rpl@google.com> Wed Nov 13 10:34:37 2019 +0000
tree 6ed58d4c80bfeb9d8333d74e252c171568f85a87
parent af9ab6de388c14cc42166ab3fab30e2dac0b8693

Better handle the Host APEX case in `build/apex/art_apex_test.py`.

Assume a Host APEX has a Debug flavor by default, and abort if another
flavor (Release or Testing) is explicitly specified.

Test: art/build/apex/runtests.sh
Test: art/build/apex/runtests.sh -t (was broken before this change)
Bug: 142938159
Bug: 139277987
Change-Id: Ifcbc07f9e81adbd394242b0c80f09a590db22554

build/apex/art_apex_test.py

diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 630a571..97c7f61 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -1087,24 +1087,26 @@
     logging.error("Need debugfs.")
     return 1
 
-  if test_args.flavor == FLAVOR_AUTO:
-    logging.warning('--flavor=auto, trying to autodetect. This may be incorrect!')
-    for flavor in [ FLAVOR_RELEASE, FLAVOR_DEBUG, FLAVOR_TESTING ]:
-      flavor_pattern = '*.%s*' % flavor
-      if fnmatch.fnmatch(test_args.apex, flavor_pattern):
-        test_args.flavor = flavor
-        break
-    if test_args.flavor == FLAVOR_AUTO:
-      logging.error('  Could not detect APEX flavor, neither \'%s\', \'%s\' nor \'%s\' in \'%s\'',
-                  FLAVOR_RELEASE, FLAVOR_DEBUG, FLAVOR_TESTING, test_args.apex)
+  if test_args.host:
+    # Host APEX.
+    if test_args.flavor not in [FLAVOR_DEBUG, FLAVOR_AUTO]:
+      logging.error("Using option --host with non-Debug APEX")
       return 1
-
-  if test_args.host and test_args.flavor == FLAVOR_RELEASE:
-    logging.error("Using option --host with Release APEX")
-    return 1
-  if test_args.host and test_args.flavor == FLAVOR_TESTING:
-    logging.error("Using option --host with Testing APEX")
-    return 1
+    # Host APEX is always a debug flavor (for now).
+    test_args.flavor = FLAVOR_DEBUG
+  else:
+    # Device APEX.
+    if test_args.flavor == FLAVOR_AUTO:
+      logging.warning('--flavor=auto, trying to autodetect. This may be incorrect!')
+      for flavor in [ FLAVOR_RELEASE, FLAVOR_DEBUG, FLAVOR_TESTING ]:
+        flavor_pattern = '*.%s*' % flavor
+        if fnmatch.fnmatch(test_args.apex, flavor_pattern):
+          test_args.flavor = flavor
+          break
+      if test_args.flavor == FLAVOR_AUTO:
+        logging.error('  Could not detect APEX flavor, neither \'%s\', \'%s\' nor \'%s\' in \'%s\'',
+                    FLAVOR_RELEASE, FLAVOR_DEBUG, FLAVOR_TESTING, test_args.apex)
+        return 1
 
   try:
     if test_args.host: