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

Commit 6d14bb36 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar
Browse files

Fix coverage testing for resolv_*_test 

Bug: http://b/182009484

- Move resolv_unit_test to the tests/ subdir, so it can depend
  on libcrypto_static, which is visible to
  packages/modules/DnsResolver/tests but not
  packages/modules/Dnsresolver.
- Have resolve_gold_test depend on libcrypto_static.

If not, the tests depend on libcrypto.so for some LLVM coverage symbols,
causing failure when run on builds where libcrypto.so is not
instrumented for coverage.

Test: Verify coverage-enabled tests don't have any undefined __llvm_*
symbols.

Change-Id: I0fd9fdae9e55b7ad8159456518922c6a1ef4fc30
parent 2d1e8672

Android.bp

+2 −43
Original line number Diff line number Diff line
@@ -287,54 +287,13 @@ filegroup { 
    ],

}



// TODO: Move this test to tests/

cc_test {

    name: "resolv_unit_test",

    test_suites: [

        "general-tests",

        "mts-dnsresolver",

    ],

    require_root: true,

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

    // TODO: Remove resolv_test_mts_coverage_defaults after mts coverage switched to 64-bit device.

    defaults: [

        "netd_defaults",

        "resolv_test_defaults",

        "resolv_test_mts_coverage_defaults",

    ],

filegroup {

    name: "resolv_unit_test_files",

    srcs: [

        "resolv_cache_unit_test.cpp",

        "resolv_callback_unit_test.cpp",

        "resolv_tls_unit_test.cpp",

        "resolv_unit_test.cpp",

        "DnsQueryLogTest.cpp",

        "DnsStatsTest.cpp",

        "ExperimentsTest.cpp",

        "OperationLimiterTest.cpp",

        "PrivateDnsConfigurationTest.cpp",

    ],

    shared_libs: [

        "libcrypto",

        "libbinder_ndk",

        "libssl",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "libcutils",

        "libgmock",

        "libnetd_resolv",

        "libnetd_test_dnsresponder_ndk",

        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libprotobuf-cpp-lite",

        "libstatslog_resolv",

        "libstatspush_compat",

        "libsysutils",

        "libutils",

        "resolv_stats_test_utils",

        "server_configurable_flags",

        "stats_proto",

    ],

}

tests/Android.bp

+48 −1
Original line number Diff line number Diff line
@@ -97,13 +97,13 @@ cc_test { 
        "libnetd_client_headers",

    ],

    shared_libs: [

        "libcrypto",

        "libbinder_ndk",

        "libssl",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "golddata_proto",

        "libcrypto_static",

        "libgmock",

        "libnetd_resolv",

        "libnetd_test_dnsresponder_ndk",
@@ -201,6 +201,53 @@ cc_test { 
    },

}



cc_test {

    name: "resolv_unit_test",

    test_suites: [

        "general-tests",

        "mts-dnsresolver",

    ],

    require_root: true,

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

    // TODO: Remove resolv_test_mts_coverage_defaults after mts coverage switched to 64-bit device.

    defaults: [

        "netd_defaults",

        "resolv_test_defaults",

        "resolv_test_mts_coverage_defaults",

    ],

    srcs: [

        "resolv_cache_unit_test.cpp",

        "resolv_callback_unit_test.cpp",

        "resolv_tls_unit_test.cpp",

        "resolv_unit_test.cpp",

        ":resolv_unit_test_files",

    ],

    shared_libs: [

        "libbinder_ndk",

        "libssl",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "libcrypto_static",

        "libcutils",

        "libgmock",

        "libnetd_resolv",

        "libnetd_test_dnsresponder_ndk",

        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libprotobuf-cpp-lite",

        "libstatslog_resolv",

        "libstatspush_compat",

        "libsysutils",

        "libutils",

        "resolv_stats_test_utils",

        "server_configurable_flags",

        "stats_proto",

    ],

}



cc_test_library {

    name: "resolv_stats_test_utils",

    srcs: [

resolv_tls_unit_test.cpp→tests/resolv_tls_unit_test.cpp

+0 −0

File moved.

View file