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

Commit 237795b6 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6431357 from d4630649 to rvc-release 

Change-Id: Id27b23fd9ae737799bd1b9cf48565a29814f3961
parents 625571bf d4630649

resolv_callback_unit_test.cpp

+6 −6
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ bool isApiLevelSupported(size_t requiredVersion) { 
#define SKIP_IF_APILEVEL_LESS_THAN(version)                                          \

    do {                                                                             \

        if (!isApiLevelSupported(version)) {                                         \

            GTEST_LOG_(INFO) << "Skip. Required API version: " << version << "\n"; \

            GTEST_LOG_(INFO) << "Skip. Required API version: " << (version) << "\n"; \

            return;                                                                  \

        }                                                                            \

    } while (0)

tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ cc_library_static { 
    srcs: [

        "golddata.proto",

    ],

    tidy: false,

}



cc_test {

tests/resolv_gold_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ using GoldTestParamType = std::tuple<DnsProtocol, std::string /* filename */>; 
class ResolvGoldTest : public TestBase, public ::testing::WithParamInterface<GoldTestParamType> {

  public:

    // Generate readable string for test name from test parameters.

    static std::string Name(::testing::TestParamInfo<GoldTestParamType> info) {

    static std::string Name(const ::testing::TestParamInfo<GoldTestParamType>& info) {

        const auto& [protocol, file] = info.param;

        std::string name = StringPrintf(

                "%s_%s", protocol == DnsProtocol::CLEARTEXT ? "CLEARTEXT" : "TLS", file.c_str());