Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9c27914 authored by Julien Desprez's avatar Julien Desprez Committed by Android (Google) Code Review
Browse files

Merge "Update a bunch of AndroidTest for apct suite" into pi-dev

parents a88c9b55 60b0348c

core/tests/coretests/BinderProxyCountingTestApp/Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,5 +24,6 @@ LOCAL_PACKAGE_NAME := BinderProxyCountingTestApp 
LOCAL_SDK_VERSION := current

LOCAL_SDK_VERSION := current

LOCAL_CERTIFICATE := platform

LOCAL_CERTIFICATE := platform





LOCAL_COMPATIBILITY_SUITE := device-tests

include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)

core/tests/coretests/BinderProxyCountingTestService/Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,5 +24,6 @@ LOCAL_PACKAGE_NAME := BinderProxyCountingTestService 
LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform

LOCAL_CERTIFICATE := platform





LOCAL_COMPATIBILITY_SUITE := device-tests

include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)

core/tests/coretests/BstatsTestApp/Android.mk

+2 −1
Original line number Original line Diff line number Diff line
@@ -30,4 +30,5 @@ LOCAL_CERTIFICATE := platform 
LOCAL_DEX_PREOPT := false

LOCAL_DEX_PREOPT := false

LOCAL_PROGUARD_ENABLED := disabled

LOCAL_PROGUARD_ENABLED := disabled





LOCAL_COMPATIBILITY_SUITE := device-tests

include $(BUILD_PACKAGE)
 
include $(BUILD_PACKAGE)

core/tests/featureflagtests/AndroidTest.xml

+5 −3
Original line number Original line Diff line number Diff line
@@ -15,14 +15,16 @@ 
  limitations under the License.

  limitations under the License.

  -->

  -->

<configuration description="Runs Frameworks Utility Tests.">

<configuration description="Runs Frameworks Utility Tests.">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-instrumentation" />



    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="FrameworksCoreFeatureFlagTests.apk" />

        <option name="test-file-name" value="FrameworksCoreFeatureFlagTests.apk" />

    </target_preparer>

    </target_preparer>





    <option name="test-suite-tag" value="apct" />

    <option name="test-tag" value="FrameworksCoreFeatureFlagTests" />

    <option name="test-tag" value="FrameworksCoreFeatureFlagTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.frameworks.coretests.featureflagtests" />

        <option name="package" value="com.android.frameworks.coretests.featureflagtests" />

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />

    </test>

    </test>

</configuration>
 
</configuration>

core/tests/overlaytests/device/AndroidTest.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -17,8 +17,10 @@ 
<configuration description="Test module config for OverlayDeviceTests">

<configuration description="Test module config for OverlayDeviceTests">

    <option name="test-tag" value="OverlayDeviceTests" />

    <option name="test-tag" value="OverlayDeviceTests" />

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-instrumentation" />





    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="OverlayDeviceTests.apk" />

        <option name="test-file-name" value="OverlayDeviceTests.apk" />

        <option name="test-file-name" value="OverlayDeviceTests_AppOverlayOne.apk" />

        <option name="test-file-name" value="OverlayDeviceTests_AppOverlayOne.apk" />

        <option name="test-file-name" value="OverlayDeviceTests_AppOverlayTwo.apk" />

        <option name="test-file-name" value="OverlayDeviceTests_AppOverlayTwo.apk" />
@@ -42,6 +44,5 @@ 




    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

        <option name="package" value="com.android.overlaytest" />

        <option name="package" value="com.android.overlaytest" />

        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />

    </test>

    </test>

</configuration>
 
</configuration>