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

Commit 13387158 authored by David Duarte's avatar David Duarte
Browse files

Run GTests with ASAN on 32bit only 

Address Sanitizer seems to only be flaky on 64bit binaries.
So workaround this issue by running the 32bit binaries on 64bit targets.

Bug: 273846603
Bug: 154347133
Test: TreeHugger
Change-Id: Ic573b01c122d44eb6928516682305bfec53fb957
parent f45d9015

Android.bp

+24 −0
Original line number Original line Diff line number Diff line
@@ -67,3 +67,27 @@ filegroup { 
        "AndroidTestTemplate.xml",

        "AndroidTestTemplate.xml",

    ],

    ],

}

}



filegroup {

    name: "BluetoothGTestForce32ConfigTemplate",

    srcs: [

        "AndroidGTestForce32Template.xml",

    ],

}



// Address Sanitizer is flaky on Android x86_64 binaries but it's not on x86

// binaries.

// This default workaround the x86_64 ASAN flakyness by running 32bit binaries

// on 64bit targets.

// TODO(b/154347133): Remove this workaround

cc_defaults {

    name: "bluetooth_gtest_x86_asan_workaround",

    target: {

        android_x86: {

            test_config_template: ":BluetoothGTestForce32ConfigTemplate",

        },

        android_x86_64: {

            enabled: false,

        },

    },

}

AndroidGTestForce32Template.xml

0 → 100644
+44 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 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="Runs {MODULE}.">

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

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

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

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

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

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

    </target_preparer>

  <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="cmd bluetooth_manager disable" />

    <option name="run-command" value="cmd bluetooth_manager wait-for-state:STATE_OFF" />

  </target_preparer>

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

    <option name="device-path" value="/data/vendor/ssrdump" />

  </target_preparer>

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

    <option name="native-test-device-path" value="/data/local/tmp" />

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

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

  </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.android.btservices" />

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

  </object>

</configuration>

system/audio_a2dp_hw/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ cc_test { 
    defaults: [

    defaults: [

        "audio_a2dp_hw_defaults",

        "audio_a2dp_hw_defaults",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    srcs: [

    srcs: [

        "test/audio_a2dp_hw_test.cc",

        "test/audio_a2dp_hw_test.cc",

system/audio_hearing_aid_hw/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ cc_test { 
    defaults: [

    defaults: [

        "audio_hearing_aid_hw_defaults",

        "audio_hearing_aid_hw_defaults",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    srcs: [

    srcs: [

        "test/audio_hearing_aid_hw_test.cc",

        "test/audio_hearing_aid_hw_test.cc",

system/bta/Android.bp

+11 −0
Original line number Original line Diff line number Diff line
@@ -187,6 +187,7 @@ cc_test { 
    defaults: [

    defaults: [

        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    test_suites: ["device-tests"],

    test_suites: ["device-tests"],

    srcs: [

    srcs: [
@@ -233,6 +234,7 @@ cc_test { 
    defaults: [

    defaults: [

        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    test_suites: ["device-tests"],

    test_suites: ["device-tests"],

    host_supported: true,

    host_supported: true,
@@ -325,6 +327,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "clang_coverage_bin",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    host_supported: true,

    host_supported: true,

    include_dirs: [

    include_dirs: [
@@ -379,6 +382,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "clang_coverage_bin",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    host_supported: true,

    host_supported: true,

    include_dirs: [

    include_dirs: [
@@ -421,6 +425,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "clang_coverage_bin",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    host_supported: true,

    host_supported: true,

    include_dirs: [

    include_dirs: [
@@ -540,6 +545,7 @@ cc_test { 
        "fluoride_defaults",

        "fluoride_defaults",

        "clang_coverage_bin",

        "clang_coverage_bin",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    host_supported: true,

    host_supported: true,

    target: {

    target: {
@@ -628,6 +634,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "clang_coverage_bin",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    host_supported: true,

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -721,6 +728,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "clang_coverage_bin",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    host_supported: true,

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -772,6 +780,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "clang_coverage_bin",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    host_supported: true,

    host_supported: true,

    include_dirs: [

    include_dirs: [
@@ -843,6 +852,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "clang_coverage_bin",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    host_supported: true,

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -899,6 +909,7 @@ cc_test { 
        "fluoride_bta_defaults",

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "clang_coverage_bin",

        "mts_defaults",

        "mts_defaults",

        "bluetooth_gtest_x86_asan_workaround",

    ],

    ],

    host_supported: true,

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below