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

Commit d41666ad authored by David Duarte's avatar David Duarte Committed by Gerrit Code Review
Browse files

Merge changes Ied955493,I0be369c4 into main 

* changes:
  Remove allocation_tracker
  Inline AlarmTestHarness in its only user
parents 075f352d 2153937f

system/btcore/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -103,10 +103,12 @@ cc_test { 
        "libbtcore",

        "libchrome",

        "libosi",

        "libosi-AllocationTestHarness",

    ],

    host_supported: true,

    test_options: {

        unit_test: true,

    },

    sanitize: {

        address: true,

    },

}

system/btcore/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ static_library("btcore") { 
if (use.test) {

  executable("net_test_btcore") {

    sources = [

      "//bt/system/osi/test/AllocationTestHarness.cc",

      "test/device_class_test.cc",

      "test/property_test.cc",

    ]

system/btcore/include/device_class.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#pragma once



#include <stdbool.h>

#include <stddef.h>

#include <stdint.h>



// Provides Class Of Device primitive as specified in the bluetooth spec.

system/btcore/test/device_class_test.cc

+3 −4
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 
 *

 ******************************************************************************/



#include "btcore/include/device_class.h"



#include <arpa/inet.h>

#include <gtest/gtest.h>

#include "osi/test/AllocationTestHarness.h"



#include "btcore/include/device_class.h"



::testing::AssertionResult check_bitfield(const char* m_expr,

                                          const char* n_expr, int m, int n) {
@@ -41,7 +40,7 @@ 
                                       << " )";

}



class DeviceClassTest : public AllocationTestHarness {};

class DeviceClassTest : public ::testing::Test {};



TEST_F(DeviceClassTest, cod_sizeof) {

  uint8_t dc_stream[] = {0x00, 0x00, 0x00, 0x00};

system/btcore/test/property_test.cc

+1 −2
Original line number Diff line number Diff line
@@ -21,13 +21,12 @@ 
#include <arpa/inet.h>

#include <gtest/gtest.h>



#include "osi/test/AllocationTestHarness.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"



using bluetooth::Uuid;



class PropertyTest : public AllocationTestHarness {};

class PropertyTest : public ::testing::Test {};



TEST_F(PropertyTest, addr) {

  RawAddress addr0 = {{0x1, 0x2, 0x3, 0x4, 0x5, 0x6}};