Move TrebleFrameworkVintfTest from cts-on-gsi to vts
Test: vts-tradefed run vts -m VtsTrebleFrameworkVintfTest
Bug: 119680185
Change-Id: Ib1af7ff9ba71d717faece23e1e24586d0a19c487
Merged-In: Ib1af7ff9ba71d717faece23e1e24586d0a19c487
(cherry picked from commit 3a153b567933b4a5e83802da7492857ab1485598)
diff --git a/treble/framework_vintf/Android.bp b/treble/framework_vintf/Android.bp
index effa6cd..b12a66f 100644
--- a/treble/framework_vintf/Android.bp
+++ b/treble/framework_vintf/Android.bp
@@ -13,5 +13,5 @@
// limitations under the License.
vts_config {
- name: "CtsOnGsiTrebleFrameworkVintfTest",
+ name: "VtsTrebleFrameworkVintfTest",
}
diff --git a/treble/framework_vintf/AndroidTest.xml b/treble/framework_vintf/AndroidTest.xml
index 3824e65..ded7d9c 100644
--- a/treble/framework_vintf/AndroidTest.xml
+++ b/treble/framework_vintf/AndroidTest.xml
@@ -13,25 +13,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Config for CtsOnGsiTrebleFrameworkVintfTest">
- <option name="test-suite-tag" value="cts" />
- <option name="config-descriptor:metadata" key="component" value="vintf" />
- <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
+<configuration description="Config for VtsTrebleFrameworkVintfTest">
+ <option name="config-descriptor:metadata" key="plan" value="vts-treble" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
+ <option name="abort-on-push-failure" value="false"/>
+ <option name="push-group" value="HalHidlTargetTest.push"/>
<option name="push" value="hal-hidl-hash/frameworks/hardware/interfaces/current.txt->/data/local/tmp/frameworks/hardware/interfaces/current.txt"/>
<option name="push" value="hal-hidl-hash/hardware/interfaces/current.txt->/data/local/tmp/hardware/interfaces/current.txt"/>
<option name="push" value="hal-hidl-hash/system/hardware/interfaces/current.txt->/data/local/tmp/system/hardware/interfaces/current.txt"/>
<option name="push" value="hal-hidl-hash/system/libhidl/transport/current.txt->/data/local/tmp/system/libhidl/transport/current.txt"/>
</target_preparer>
- <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
- <option name="abort-on-push-failure" value="false"/>
- <option name="push" value="DATA/nativetest/vts_treble_vintf_framework_test/vts_treble_vintf_framework_test->/data/nativetest/vts_treble_vintf_framework_test"/>
- <option name="push" value="DATA/nativetest64/vts_treble_vintf_framework_test/vts_treble_vintf_framework_test->/data/nativetest/vts_treble_vintf_framework_test"/>
- <option name="append-bitness" value="true" />
- <option name="post-push" value="chmod a+x /data/nativetest/vts_treble_vintf_framework_test" />
- </target_preparer>
- <test class="com.android.tradefed.testtype.GTest" >
- <option name="module-name" value="vts_treble_vintf_framework_test" />
- <option name="runtime-hint" value="1m" />
+ <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
+ <option name="test-module-name" value="VtsTrebleFrameworkVintfTest"/>
+ <option name="binary-test-working-directory" value="_32bit::/data/nativetest/" />
+ <option name="binary-test-working-directory" value="_64bit::/data/nativetest64/" />
+ <option name="binary-test-source" value="_32bit::DATA/nativetest/vts_treble_vintf_framework_test/vts_treble_vintf_framework_test" />
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_treble_vintf_framework_test/vts_treble_vintf_framework_test" />
+ <option name="binary-test-type" value="gtest"/>
+ <option name="disable-framework" value="false"/>
+ <option name="test-timeout" value="5m"/>
</test>
</configuration>
diff --git a/treble/vintf/Android.bp b/treble/vintf/Android.bp
index 50a0888..33d6bce 100644
--- a/treble/vintf/Android.bp
+++ b/treble/vintf/Android.bp
@@ -77,14 +77,6 @@
"SingleManifestTest.cpp",
"SystemVendorTest.cpp",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
}
// Tests everything.
