diff options
| author | Jinhui Wang <jinhuiw@google.com> | 2017-03-14 17:30:59 -0700 |
|---|---|---|
| committer | Jinhui Wang <jinhuiw@google.com> | 2017-03-14 17:33:14 -0700 |
| commit | b0efdb144a82977a9e8c8abfedd786061d88b14c (patch) | |
| tree | 78c1f3c996aa1c9722f58e25a0869b39de9e64b7 | |
| parent | 617d2913a5147255f3d6e6009f658603c6645f47 (diff) | |
| download | AfwTestHarness-b0efdb144a82977a9e8c8abfedd786061d88b14c.tar.gz | |
Bump up test harness version to 3.0.1 for O
Also move "enable nfc" command right after afw-test-common; otherwise
it might not take effect when the test starts.
Bug: 36231466
Change-Id: If549215ffb95aed4a4c5880e305aa736ff469942
| -rw-r--r-- | tests/NfcProvisioning/AndroidTest.xml | 9 | ||||
| -rw-r--r-- | tools/tradefed-host/Android.mk | 2 | ||||
| -rw-r--r-- | tools/tradefed-host/res/report/cts_result.xsl | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/tests/NfcProvisioning/AndroidTest.xml b/tests/NfcProvisioning/AndroidTest.xml index eb8f1bf..7572cf2 100644 --- a/tests/NfcProvisioning/AndroidTest.xml +++ b/tests/NfcProvisioning/AndroidTest.xml @@ -23,6 +23,10 @@ <!-- General device setup. --> <include name="afw-test-common"/> + <!-- Turn on NFC --> + <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> + <option name="run-command" value="svc nfc enable" /> + </target_preparer> <!-- Dump testing environment info to android-cts/repository/logs/ --> <target_preparer class="com.android.afwtest.tradefed.targetprep.AfwTestEnvDumper" > @@ -34,11 +38,6 @@ <option name="test-file-name" value="AfwTestNfcProvisioningTestCases.apk"/> </target_preparer> - <!-- Turn on NFC --> - <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> - <option name="run-command" value="svc nfc enable" /> - </target_preparer> - <test class="com.android.afwtest.tradefed.testtype.AfwAndroidJUnitTest"> <option name="package" value="com.android.afwtest.nfcprovisioning"/> </test> diff --git a/tools/tradefed-host/Android.mk b/tools/tradefed-host/Android.mk index 1d56213..30c9db4 100644 --- a/tools/tradefed-host/Android.mk +++ b/tools/tradefed-host/Android.mk @@ -36,7 +36,7 @@ LOCAL_SUITE_BUILD_NUMBER := $(BUILD_NUMBER_FROM_FILE) LOCAL_SUITE_TARGET_ARCH := $(TARGET_ARCH) LOCAL_SUITE_NAME := CTS LOCAL_SUITE_FULLNAME := "for Work Test Harness" -LOCAL_SUITE_VERSION := 2.2 +LOCAL_SUITE_VERSION := 3.0.1 include $(BUILD_COMPATIBILITY_SUITE) diff --git a/tools/tradefed-host/res/report/cts_result.xsl b/tools/tradefed-host/res/report/cts_result.xsl index 247ed6d..c21b26f 100644 --- a/tools/tradefed-host/res/report/cts_result.xsl +++ b/tools/tradefed-host/res/report/cts_result.xsl @@ -325,7 +325,7 @@ </TR> <TR> <TD class="rowtitle">Afw Test Harness Version</TD> - <TD>2.2</TD> + <TD>3.0.1</TD> </TR> <TR> <TD class="rowtitle">Test timeout</TD> |