commit edda3caf7c02c241dc466ecd02a8555972c46c4d
author David Srbecky <dsrbecky@google.com> Wed Jul 08 00:41:08 2020 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 08 16:05:41 2020 +0000
tree c21fa6218003389877739f67a636d75e1c1915b8
parent dd5db458831cf74ae5813d2278fbd599145c4522

Use different extension for smali test files.

The test infra just searches for and opens all .jar files.
The different extension effectively hides the test files from it.

Bug: 147817558
Bug: 160391839
Test: m test-art-host-gtest
Change-Id: Ida3c102008b772841076df4e374532f7845b8c61

build/apex/art_apex_test.py

diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 7764c7c..1a337cb 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -770,7 +770,7 @@
     self._checker.check_art_test_data('art-gtest-jars-Main.jar')
     self._checker.check_art_test_data('art-gtest-jars-ProtoCompare.jar')
     self._checker.check_art_test_data('art-gtest-jars-Transaction.jar')
-    self._checker.check_art_test_data('art-gtest-jars-VerifierDepsMulti.jar')
+    self._checker.check_art_test_data('art-gtest-jars-VerifierDepsMulti.dex')
     self._checker.check_art_test_data('art-gtest-jars-Nested.jar')
     self._checker.check_art_test_data('art-gtest-jars-MyClass.jar')
     self._checker.check_art_test_data('art-gtest-jars-ManyMethods.jar')
@@ -784,10 +784,10 @@
     self._checker.check_art_test_data('art-gtest-jars-DexToDexDecompiler.jar')
     self._checker.check_art_test_data('art-gtest-jars-HiddenApiSignatures.jar')
     self._checker.check_art_test_data('art-gtest-jars-ForClassLoaderB.jar')
-    self._checker.check_art_test_data('art-gtest-jars-LinkageTest.jar')
+    self._checker.check_art_test_data('art-gtest-jars-LinkageTest.dex')
     self._checker.check_art_test_data('art-gtest-jars-MethodTypes.jar')
     self._checker.check_art_test_data('art-gtest-jars-ErroneousInit.jar')
-    self._checker.check_art_test_data('art-gtest-jars-VerifierDeps.jar')
+    self._checker.check_art_test_data('art-gtest-jars-VerifierDeps.dex')
     self._checker.check_art_test_data('art-gtest-jars-StringLiterals.jar')
     self._checker.check_art_test_data('art-gtest-jars-XandY.jar')
     self._checker.check_art_test_data('art-gtest-jars-ExceptionHandle.jar')
@@ -804,7 +804,7 @@
     self._checker.check_art_test_data('art-gtest-jars-MultiDexUncompressedAligned.jar')
     self._checker.check_art_test_data('art-gtest-jars-StaticsFromCode.jar')
     self._checker.check_art_test_data('art-gtest-jars-ProfileTestMultiDex.jar')
-    self._checker.check_art_test_data('art-gtest-jars-VerifySoftFailDuringClinit.jar')
+    self._checker.check_art_test_data('art-gtest-jars-VerifySoftFailDuringClinit.dex')
     self._checker.check_art_test_data('art-gtest-jars-MainStripped.jar')
     self._checker.check_art_test_data('art-gtest-jars-ForClassLoaderA.jar')
     self._checker.check_art_test_data('art-gtest-jars-StaticLeafMethods.jar')