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

Commit 228a3c88 authored by Kimberly Kreider's avatar Kimberly Kreider Committed by Gerrit Code Review
Browse files

Merge "Enable DNS resolver tests to be included in android-mts-dnsresolver as well as android-mts."

parents e84604d6 c4260f5c

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ cc_test { 
    name: "resolv_unit_test",

    test_suites: [

        "general-tests",

        "mts",

        "mts-dnsresolver",

    ],

    require_root: true,

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

tests/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ cc_library_static { 


cc_test {

    name: "resolv_gold_test",

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

    test_suites: ["general-tests", "mts-dnsresolver"],

    require_root: true,

    // b/151392634, this is a workaround because MTS

    // can not handle the test with testdata correctly.
@@ -113,7 +113,7 @@ cc_test { 


cc_test {

    name: "resolv_stress_test",

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

    test_suites: ["general-tests", "mts-dnsresolver"],

    // This won't work with test_config

    // require_root: true,

    // TODO: Remove resolv_test_mts_coverage_defaults after mts coverage switched to 64-bit device.
@@ -142,7 +142,7 @@ cc_test { 


cc_test {

    name: "resolv_integration_test",

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

    test_suites: ["general-tests", "mts-dnsresolver"],

    require_root: true,

    test_config_template: ":resolv_test_config_template",

    defaults: ["netd_defaults", "resolv_test_defaults"],