summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-12-22 23:33:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-12-22 23:33:33 +0000
commited5c9c4c6be31a007b2d6a0d9f25a6c4848d2ae7 (patch)
tree1d46464329a01ff61f455b7cc436d85c4acceee8
parent197fc220b2b6fdaf7b5086851361aab7117bae36 (diff)
parent428fab62429e00095fcb84cbf6d7f8752ad2aac2 (diff)
downloadvndk-ed5c9c4c6be31a007b2d6a0d9f25a6c4848d2ae7.tar.gz
Merge "config change after VtsPythonVirtualenvPreparer change"
-rw-r--r--abi/AndroidTest.xml4
-rw-r--r--dependency/AndroidTest.xml4
-rw-r--r--files/AndroidTest.xml4
-rw-r--r--open_libraries/AndroidTest.xml4
4 files changed, 8 insertions, 8 deletions
diff --git a/abi/AndroidTest.xml b/abi/AndroidTest.xml
index 5dd21e0..b0d361a 100644
--- a/abi/AndroidTest.xml
+++ b/abi/AndroidTest.xml
@@ -17,8 +17,8 @@
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
</target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
- </target_preparer>
+ <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
+ </multi_target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsVndkAbi" />
<option name="test-case-path" value="vts/testcases/vndk/abi/VtsVndkAbiTest" />
diff --git a/dependency/AndroidTest.xml b/dependency/AndroidTest.xml
index b0f462f..d404368 100644
--- a/dependency/AndroidTest.xml
+++ b/dependency/AndroidTest.xml
@@ -17,8 +17,8 @@
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
</target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
- </target_preparer>
+ <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
+ </multi_target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsVndkDependency" />
<option name="test-case-path" value="vts/testcases/vndk/dependency/VtsVndkDependencyTest" />
diff --git a/files/AndroidTest.xml b/files/AndroidTest.xml
index 125be83..91e81ac 100644
--- a/files/AndroidTest.xml
+++ b/files/AndroidTest.xml
@@ -17,8 +17,8 @@
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
</target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
- </target_preparer>
+ <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
+ </multi_target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsVndkFiles" />
<option name="test-case-path" value="vts/testcases/vndk/files/VtsVndkFilesTest" />
diff --git a/open_libraries/AndroidTest.xml b/open_libraries/AndroidTest.xml
index e792595..108f6a3 100644
--- a/open_libraries/AndroidTest.xml
+++ b/open_libraries/AndroidTest.xml
@@ -17,8 +17,8 @@
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
</target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
- </target_preparer>
+ <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
+ </multi_target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsVndkOpenLibraries" />
<option name="test-case-path" value="vts/testcases/vndk/open_libraries/VtsVndkOpenLibrariesTest" />