summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Shi <dshi@google.com>2021-09-16 23:31:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-16 23:31:11 +0000
commitf24c59e378d91ed388865761f2564593db88c282 (patch)
treec99b3f68e4fc95a368e6b646a5e3e21186ab32b4
parentacb915615e9723abed3e240eb6f73f6bc29ae90e (diff)
parent0678a692643a275e19c692aadb67b0398dfea4c7 (diff)
downloadhal-temp_sam_202323961.tar.gz
Merge "Remove obsoleted test config" am: 0678a69264temp_sam_202323961
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/hal/+/1828481 Change-Id: I81bde134c6eb6c528640b5c4f4e7da926cb6f8a3
-rw-r--r--neuralnetworks/V1_0/target/AndroidTest.xml32
-rw-r--r--neuralnetworks/V1_1/target/AndroidTest.xml32
-rw-r--r--neuralnetworks/V1_2/target/AndroidTest.xml32
-rw-r--r--neuralnetworks/V1_3/target/AndroidTest.xml32
4 files changed, 0 insertions, 128 deletions
diff --git a/neuralnetworks/V1_0/target/AndroidTest.xml b/neuralnetworks/V1_0/target/AndroidTest.xml
deleted file mode 100644
index 2664b882..00000000
--- a/neuralnetworks/V1_0/target/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Config for VTS VtsHalNeuralnetworksV1_0Target test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-hal" />
- <option name="config-descriptor:metadata" key="plan" value="vts10" />
- <object class="com.android.tradefed.testtype.suite.module.TestFailureModuleController" type="module_controller">
- <option name="screenshot-on-failure" value="false"/>
- </object>
- <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="DATA/nativetest/VtsHalNeuralnetworksV1_0TargetTest/VtsHalNeuralnetworksV1_0TargetTest->/data/nativetest/VtsHalNeuralnetworksV1_0TargetTest/VtsHalNeuralnetworksV1_0TargetTest"/>
- <option name="push" value="DATA/nativetest64/VtsHalNeuralnetworksV1_0TargetTest/VtsHalNeuralnetworksV1_0TargetTest->/data/nativetest64/VtsHalNeuralnetworksV1_0TargetTest/VtsHalNeuralnetworksV1_0TargetTest"/>
- </target_preparer>
- <test class="com.android.tradefed.testtype.GTest">
- <option name="module-name" value="VtsHalNeuralnetworksV1_0TargetTest"/>
- <option name="native-test-timeout" value="30m"/>
- </test>
-</configuration>
diff --git a/neuralnetworks/V1_1/target/AndroidTest.xml b/neuralnetworks/V1_1/target/AndroidTest.xml
deleted file mode 100644
index f356532f..00000000
--- a/neuralnetworks/V1_1/target/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Config for VTS VtsHalNeuralnetworksV1_1Target test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-hal" />
- <option name="config-descriptor:metadata" key="plan" value="vts10" />
- <object class="com.android.tradefed.testtype.suite.module.TestFailureModuleController" type="module_controller">
- <option name="screenshot-on-failure" value="false"/>
- </object>
- <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="DATA/nativetest/VtsHalNeuralnetworksV1_1TargetTest/VtsHalNeuralnetworksV1_1TargetTest->/data/nativetest/VtsHalNeuralnetworksV1_1TargetTest/VtsHalNeuralnetworksV1_1TargetTest"/>
- <option name="push" value="DATA/nativetest64/VtsHalNeuralnetworksV1_1TargetTest/VtsHalNeuralnetworksV1_1TargetTest->/data/nativetest64/VtsHalNeuralnetworksV1_1TargetTest/VtsHalNeuralnetworksV1_1TargetTest"/>
- </target_preparer>
- <test class="com.android.tradefed.testtype.GTest">
- <option name="module-name" value="VtsHalNeuralnetworksV1_1TargetTest"/>
- <option name="native-test-timeout" value="1h"/>
- </test>
-</configuration>
diff --git a/neuralnetworks/V1_2/target/AndroidTest.xml b/neuralnetworks/V1_2/target/AndroidTest.xml
deleted file mode 100644
index a03eb0e6..00000000
--- a/neuralnetworks/V1_2/target/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Config for VTS VtsHalNeuralnetworksV1_2Target test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-hal" />
- <option name="config-descriptor:metadata" key="plan" value="vts10" />
- <object class="com.android.tradefed.testtype.suite.module.TestFailureModuleController" type="module_controller">
- <option name="screenshot-on-failure" value="false"/>
- </object>
- <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="DATA/nativetest/VtsHalNeuralnetworksV1_2TargetTest/VtsHalNeuralnetworksV1_2TargetTest->/data/nativetest/VtsHalNeuralnetworksV1_2TargetTest/VtsHalNeuralnetworksV1_2TargetTest"/>
- <option name="push" value="DATA/nativetest64/VtsHalNeuralnetworksV1_2TargetTest/VtsHalNeuralnetworksV1_2TargetTest->/data/nativetest64/VtsHalNeuralnetworksV1_2TargetTest/VtsHalNeuralnetworksV1_2TargetTest"/>
- </target_preparer>
- <test class="com.android.tradefed.testtype.GTest">
- <option name="module-name" value="VtsHalNeuralnetworksV1_2TargetTest"/>
- <option name="native-test-timeout" value="10h"/>
- </test>
-</configuration>
diff --git a/neuralnetworks/V1_3/target/AndroidTest.xml b/neuralnetworks/V1_3/target/AndroidTest.xml
deleted file mode 100644
index 286dc98d..00000000
--- a/neuralnetworks/V1_3/target/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Config for VTS VtsHalNeuralnetworksV1_3Target test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-hal" />
- <option name="config-descriptor:metadata" key="plan" value="vts10" />
- <object class="com.android.tradefed.testtype.suite.module.TestFailureModuleController" type="module_controller">
- <option name="screenshot-on-failure" value="false"/>
- </object>
- <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="DATA/nativetest/VtsHalNeuralnetworksV1_3TargetTest/VtsHalNeuralnetworksV1_3TargetTest->/data/nativetest/VtsHalNeuralnetworksV1_3TargetTest/VtsHalNeuralnetworksV1_3TargetTest"/>
- <option name="push" value="DATA/nativetest64/VtsHalNeuralnetworksV1_3TargetTest/VtsHalNeuralnetworksV1_3TargetTest->/data/nativetest64/VtsHalNeuralnetworksV1_3TargetTest/VtsHalNeuralnetworksV1_3TargetTest"/>
- </target_preparer>
- <test class="com.android.tradefed.testtype.GTest">
- <option name="module-name" value="VtsHalNeuralnetworksV1_3TargetTest"/>
- <option name="native-test-timeout" value="10h"/>
- </test>
-</configuration>