diff options
| author | Jinhui Wang <jinhuiw@google.com> | 2016-08-10 17:13:41 -0700 |
|---|---|---|
| committer | Jinhui Wang <jinhuiw@google.com> | 2016-08-10 17:13:41 -0700 |
| commit | 22d065954bcdd50f2e1054a5e53aa486317d81a3 (patch) | |
| tree | 54072ef5681ac93d1f2de5f523b0b7c326a6235d | |
| parent | 7830f6dc7540444e5375a4580cef32b00d15b1ed (diff) | |
| download | AfwTestHarness-22d065954bcdd50f2e1054a5e53aa486317d81a3.tar.gz | |
Cleanup target preparer config files
Change-Id: I98b9edebeb4f4818094782b1fcb71f459b5468e6
| -rw-r--r-- | tests/NfcProvisioning/AndroidTest.xml | 3 | ||||
| -rw-r--r-- | tests/NonSuwPoProvisioning/AndroidTest.xml | 3 | ||||
| -rw-r--r-- | tests/SuwDoProvisioning/AndroidTest.xml | 3 | ||||
| -rw-r--r-- | tests/SuwPoProvisioning/AndroidTest.xml | 3 | ||||
| -rw-r--r-- | tools/tradefed-host/res/config/afw-test-common.xml | 3 |
5 files changed, 3 insertions, 12 deletions
diff --git a/tests/NfcProvisioning/AndroidTest.xml b/tests/NfcProvisioning/AndroidTest.xml index 5a06ba9..afb639d 100644 --- a/tests/NfcProvisioning/AndroidTest.xml +++ b/tests/NfcProvisioning/AndroidTest.xml @@ -24,9 +24,6 @@ <!-- General device setup. --> <include name="afw-test-common"/> - <!-- Push afw-test.props --> - <include name="afw-test-push-test-suite-config"/> - <!-- Dump testing environment info to android-cts/repository/logs/ --> <target_preparer class="com.android.afwtest.tradefed.targetprep.AfwTestEnvDumper" > <option name="file-name-prefix" value="AfwTestNfcProvisioningTestCases"/> diff --git a/tests/NonSuwPoProvisioning/AndroidTest.xml b/tests/NonSuwPoProvisioning/AndroidTest.xml index d0c9235..7a4c37f 100644 --- a/tests/NonSuwPoProvisioning/AndroidTest.xml +++ b/tests/NonSuwPoProvisioning/AndroidTest.xml @@ -30,9 +30,6 @@ <!-- Connect wifi --> <include name="afw-test-wifi"/> - <!-- Push afw-test.props --> - <include name="afw-test-push-test-suite-config"/> - <!-- Uninstall TestDpc and reset users. --> <include name="afw-test-uninstall-testdpc-and-reset-users"/> diff --git a/tests/SuwDoProvisioning/AndroidTest.xml b/tests/SuwDoProvisioning/AndroidTest.xml index a94ecf3..eec3790 100644 --- a/tests/SuwDoProvisioning/AndroidTest.xml +++ b/tests/SuwDoProvisioning/AndroidTest.xml @@ -31,9 +31,6 @@ <!-- Connect wifi --> <include name="afw-test-wifi"/> - <!-- Push afw-test.props --> - <include name="afw-test-push-test-suite-config"/> - <!-- Dump testing environment info to android-cts/repository/logs/ --> <target_preparer class="com.android.afwtest.tradefed.targetprep.AfwTestEnvDumper" > <option name="file-name-prefix" value="AfwTestSuwDoProvisioningTestCases"/> diff --git a/tests/SuwPoProvisioning/AndroidTest.xml b/tests/SuwPoProvisioning/AndroidTest.xml index 7a6a5f4..64682aa 100644 --- a/tests/SuwPoProvisioning/AndroidTest.xml +++ b/tests/SuwPoProvisioning/AndroidTest.xml @@ -31,9 +31,6 @@ <!-- Connect wifi --> <include name="afw-test-wifi"/> - <!-- Push afw-test.props --> - <include name="afw-test-push-test-suite-config"/> - <!-- Remove non-primary user after the test. --> <target_preparer class="com.android.afwtest.tradefed.targetprep.AfwTestUserRemover"> <option name="remove-users-before-test" value="false"/> diff --git a/tools/tradefed-host/res/config/afw-test-common.xml b/tools/tradefed-host/res/config/afw-test-common.xml index b32545a..ffd5fce 100644 --- a/tools/tradefed-host/res/config/afw-test-common.xml +++ b/tools/tradefed-host/res/config/afw-test-common.xml @@ -28,4 +28,7 @@ <option name="run-command" value="settings put global package_verifier_enable 0" /> </target_preparer> + <!-- Push afw-test.props --> + <include name="afw-test-push-test-suite-config"/> + </configuration> |