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

Commit 3b122b17 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "aconfig: include all tests in TEST_MAPPING" into main am: 83bc504d 

Original change: https://android-review.googlesource.com/c/platform/build/+/2870454



Change-Id: Ia74cd60c66bcd6da5446d2d8aa811d8687831d28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 773c57f5 83bc504d

tools/aconfig/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ rust_test_host { 
    rustlibs: [

        "libitertools",

    ],

    test_suites: ["general-tests"],

}



// integration tests: general
@@ -125,7 +126,7 @@ android_test { 
        "androidx.test.rules",

        "testng",

    ],

    test_suites: ["device-tests"],

    test_suites: ["general-tests"],

}



java_aconfig_library {
@@ -172,6 +173,7 @@ cc_test { 
    shared_libs: [

        "server_configurable_flags",

    ],

    test_suites: ["general-tests"],

}



cc_test {
@@ -186,6 +188,7 @@ cc_test { 
    shared_libs: [

        "server_configurable_flags",

    ],

    test_suites: ["general-tests"],

}



rust_aconfig_library {
@@ -202,6 +205,7 @@ rust_test { 
    rustlibs: [

        "libaconfig_test_rust_library",

    ],

    test_suites: ["general-tests"],

}



rust_aconfig_library {
@@ -219,4 +223,5 @@ rust_test { 
    rustlibs: [

        "libaconfig_test_rust_library_with_test_mode",

    ],

    test_suites: ["general-tests"],

}

tools/aconfig/TEST_MAPPING

+30 −0
Original line number Diff line number Diff line
@@ -17,5 +17,35 @@ 
      // that using the flag macros to do filtering will get affected.

      "name": "FlagMacrosTests"

    }

  ],

  "postsubmit": [

    {

      // aconfig unit tests

      "name": "aconfig.test"

    },

    {

      // aconfig Java integration tests

      "name": "aconfig.test.java"

    },

    {

      // aconfig C++ integration tests (production mode auto-generated code)

      "name": "aconfig.test.cpp"

    },

    {

      // aconfig C++ integration tests (test mode auto-generated code)

      "name": "aconfig.test.cpp.test_mode"

    },

    {

      // aconfig C++ integration tests (production mode auto-generated code)

      "name": "aconfig.prod_mode.test.rust"

    },

    {

      // aconfig C++ integration tests (test mode auto-generated code)

      "name": "aconfig.test_mode.test.rust"

    },

    {

      // printflags unit tests

      "name": "printflags.test"

    }

  ]

}

tools/aconfig/printflags/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,4 +24,5 @@ rust_binary { 
rust_test_host {

    name: "printflags.test",

    defaults: ["printflags.defaults"],

    test_suites: ["general-tests"],

}