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

Commit 8cf0cad6 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Added module_controller test config + fix test install" into tm-dev am:... 

Merge "Added module_controller test config + fix test install" into tm-dev am: 5642bb7e am: 51d3c29b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18569312



Change-Id: I4f79b8b37ec7c92187403373355110c74e78cb30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 312bec5f 51d3c29b

AndroidTestTemplate.xml

+11 −4
Original line number Original line Diff line number Diff line
@@ -17,9 +17,10 @@ 
  <option name="test-suite-tag" value="apct" />

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

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

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

  <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

  <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

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

  <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

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

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

        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

        <option name="append-bitness" value="true" />

    </target_preparer>

    </target_preparer>

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

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

    <option name="run-command" value="settings put global ble_scan_always_enabled 0" />

    <option name="run-command" value="settings put global ble_scan_always_enabled 0" />
@@ -33,4 +34,10 @@ 
    <option name="module-name" value="{MODULE}" />

    <option name="module-name" value="{MODULE}" />

    <option name="run-test-as" value="0" />

    <option name="run-test-as" value="0" />

  </test>

  </test>



  <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->

  <object type="module_controller"

          class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

      <option name="mainline-module-package-name" value="com.google.android.bluetooth" />

  </object>

</configuration>
 
</configuration>

system/gd/AndroidTestTemplate.xml

+11 −4
Original line number Original line Diff line number Diff line
@@ -17,9 +17,10 @@ 
  <option name="test-suite-tag" value="apct" />

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

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

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

  <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

  <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />

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

  <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

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

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

        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

        <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

        <option name="append-bitness" value="true" />

    </target_preparer>

    </target_preparer>

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

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

    <option name="run-command" value="settings put global ble_scan_always_enabled 0" />

    <option name="run-command" value="settings put global ble_scan_always_enabled 0" />
@@ -33,4 +34,10 @@ 
    <option name="module-name" value="{MODULE}" />

    <option name="module-name" value="{MODULE}" />

    <option name="run-test-as" value="0" />

    <option name="run-test-as" value="0" />

  </test>

  </test>



  <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->

  <object type="module_controller"

          class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

      <option name="mainline-module-package-name" value="com.google.android.bluetooth" />

  </object>

</configuration>
 
</configuration>

system/test/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -456,6 +456,7 @@ cc_defaults { 
    name: "mts_defaults",

    name: "mts_defaults",

    target: {

    target: {

        android: {

        android: {

            test_config_template: ":BluetoothTestConfigTemplate",

            test_suites: ["mts-bluetooth",],

            test_suites: ["mts-bluetooth",],

        },

        },

    },

    },