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

Commit 84ebc21b authored by Bernie Innocenti's avatar Bernie Innocenti Committed by Gerrit Code Review
Browse files

Merge changes I25fe98ac,I24f2506c 

* changes:
  Add DnsResolver tests to mts test suite
  resolv_gold_test: Print file name on load errors
parents bd7ee22d cac2784e

Android.bp

+10 −1
Original line number Original line Diff line number Diff line
@@ -164,7 +164,7 @@ cc_library_static { 
// TODO: Move this test to tests/

// TODO: Move this test to tests/

cc_test {

cc_test {

    name: "resolv_unit_test",

    name: "resolv_unit_test",

    test_suites: ["device-tests"],

    test_suites: ["device-tests", "mts"],

    require_root: true,

    require_root: true,

    //TODO:  drop root privileges and make it be an real unit test.

    //TODO:  drop root privileges and make it be an real unit test.

    defaults: ["netd_defaults"],

    defaults: ["netd_defaults"],
@@ -200,4 +200,13 @@ cc_test { 
        "server_configurable_flags",

        "server_configurable_flags",

        "stats_proto",

        "stats_proto",

    ],

    ],

    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },

}
 
}

tests/Android.bp

+13 −4
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ cc_library_static { 




cc_test {

cc_test {

    name: "resolv_gold_test",

    name: "resolv_gold_test",

    test_suites: ["device-tests"],

    test_suites: ["device-tests", "mts"],

    require_root: true,

    require_root: true,

    defaults: ["netd_defaults"],

    defaults: ["netd_defaults"],

    data: ["testdata/*.pbtxt"],

    data: ["testdata/*.pbtxt"],
@@ -64,11 +64,12 @@ cc_test { 
        "server_configurable_flags",

        "server_configurable_flags",

        "stats_proto",

        "stats_proto",

    ],

    ],

    compile_multilib: "first",

}

}





cc_test {

cc_test {

    name: "resolv_stress_test",

    name: "resolv_stress_test",

    test_suites: ["device-tests"],

    test_suites: ["device-tests", "mts"],

    // This won't work with test_config

    // This won't work with test_config

    // require_root: true,

    // require_root: true,

    test_config: "resolv_stress_test_config.xml",

    test_config: "resolv_stress_test_config.xml",
@@ -95,12 +96,12 @@ cc_test { 
        "netd_event_listener_interface-ndk_platform",

        "netd_event_listener_interface-ndk_platform",

        "netd_aidl_interface-ndk_platform",

        "netd_aidl_interface-ndk_platform",

    ],

    ],

    compile_multilib: "both",

    compile_multilib: "first",

}

}





cc_test {

cc_test {

    name: "resolv_integration_test",

    name: "resolv_integration_test",

    test_suites: ["device-tests"],

    test_suites: ["device-tests", "mts"],

    require_root: true,

    require_root: true,

    defaults: ["netd_defaults"],

    defaults: ["netd_defaults"],

    tidy: false, // cuts test build time by > 1m30s

    tidy: false, // cuts test build time by > 1m30s
@@ -138,4 +139,12 @@ cc_test { 
        "netd_event_listener_interface-ndk_platform",

        "netd_event_listener_interface-ndk_platform",

    ],

    ],

    compile_multilib: "both",

    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },

}
 
}

tests/resolv_gold_test.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -126,8 +126,9 @@ class TestBase : public ::testing::Test { 
    GoldTest ToProto(const std::string& file) {

    GoldTest ToProto(const std::string& file) {

        // Convert the testing configuration from .pbtxt file to proto.

        // Convert the testing configuration from .pbtxt file to proto.

        std::string file_content;

        std::string file_content;

        EXPECT_TRUE(android::base::ReadFileToString(kTestDataPath + file, &file_content))

        const std::string file_name = kTestDataPath + file;

                << strerror(errno);

        EXPECT_TRUE(android::base::ReadFileToString(file_name, &file_content))

                << "Failed to read " << file_name << ": " << strerror(errno);

        android::net::GoldTest goldtest;

        android::net::GoldTest goldtest;

        EXPECT_TRUE(google::protobuf::TextFormat::ParseFromString(file_content, &goldtest));

        EXPECT_TRUE(google::protobuf::TextFormat::ParseFromString(file_content, &goldtest));

        return goldtest;

        return goldtest;