commit daee51f893902526b191b3a3c5dd179b1964a352
author Sooraj Sasindran <sasindran@google.com> Mon May 18 20:18:53 2020 +0000
committer Sooraj Sasindran <sasindran@google.com> Mon May 18 22:36:23 2020 +0000
tree faca774f561058f351198ce4d8efa67370851259
parent fa082fb9f60e867b5a13a63ca76791c1c12a58f5

Revert "Move ArtGtestsTarget to general-tests."

This reverts commit c6849c6805251b699b4f8d954861c325f3cb1985.

Reason for revert: b/156939667

Change-Id: I72e8c2e0e2b3676b0a7f15e585b1bbf07193c6a5

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index b0813db..769f39f 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -943,7 +943,7 @@
         ":com.android.art.testing",
         ":art-gtest-jars",
     ],
-    test_suites: ["general-tests"],
+    test_suites: ["device-tests"],
     test_config: "gtests-target.xml",
 }
 

test/gtests-target.xml

diff --git a/test/gtests-target.xml b/test/gtests-target.xml
index 62aa938..7152835 100644
--- a/test/gtests-target.xml
+++ b/test/gtests-target.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <configuration description="ART gtests">
-    <option name="test-suite-tag" value="art" />
     <target_preparer class="com.android.tradefed.targetprep.InstallApexModuleTargetPreparer" >
         <option name="test-file-name" value="com.android.art.testing.apex" />
     </target_preparer>