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

Commit 369e1c23 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Start using experimental APIs" into main

parents 641152c9 21a3e6cf

ravenwood/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ 
      "host": true

    },

    {

      "name": "RavenwoodUiTest",

      "name": "RavenwoodUiTest_noexp",

      "host": true

    },

    {

ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRunnerState.java

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ public final class RavenwoodRunnerState { 
                || sActiveProperties.stream().anyMatch(p -> p.second.isKeyAccessible(key, write));



        if (!result) {

            if (RavenwoodEnvironment.getInstance().getBoolEnvVar(ALLOW_ALL_SYSPROP_READ_ENV)

            if ((RavenwoodExperimentalApiChecker.isExperimentalApiEnabled()

                    || RavenwoodEnvironment.getInstance().getBoolEnvVar(ALLOW_ALL_SYSPROP_READ_ENV))

                    && !write) {

                Log.w(TAG, "Unallow-listed property read detected: key=" + key);

                return;

ravenwood/scripts/run-ravenwood-tests.sh

+6 −0
Original line number Diff line number Diff line
@@ -204,6 +204,12 @@ fi 


echo "RAVENWOOD_TEST_ENABLEMENT_POLICY=$RAVENWOOD_TEST_ENABLEMENT_POLICY"



# Set experimental API flag

for test in $(remove_comments ../texts/experimental-api-allowed-tests.txt); do

    echo "Test \"$test\" can use experimental APIs".

    export RAVENWOOD_ENABLE_EXP_API_${test}=1

done



# =========================================================



run() {

ravenwood/scripts/tests/golden-output/output-golden.txt

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Target tests: 
  Test3

  SystemUiRavenTests

RAVENWOOD_TEST_ENABLEMENT_POLICY=/tmp/ravenwood-enablement-@@@-@@@.txt

Test "RavenwoodUiTest_exp" can use experimental APIs.

Running: echo atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 Test2 Test3 SystemUiRavenTests -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest

atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 Test2 Test3 SystemUiRavenTests -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest
@@ -42,6 +43,7 @@ Target tests: 
Excluded tests:

< SystemUiRavenTests

RAVENWOOD_TEST_ENABLEMENT_POLICY=/tmp/ravenwood-enablement-@@@-@@@.txt

Test "RavenwoodUiTest_exp" can use experimental APIs.

Running: echo atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 Test2 Test3 -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg RavenwoodCoreTest:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.LargeTest

atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 Test2 Test3 -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg RavenwoodCoreTest:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.LargeTest
@@ -64,6 +66,7 @@ Target tests: 
  Test3

  SystemUiRavenTests

RAVENWOOD_TEST_ENABLEMENT_POLICY=/tmp/ravenwood-enablement-@@@-@@@.txt

Test "RavenwoodUiTest_exp" can use experimental APIs.

Running: echo atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 Test2 Test3 SystemUiRavenTests -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg RavenwoodCoreTest:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.LargeTest

atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 Test2 Test3 SystemUiRavenTests -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg RavenwoodCoreTest:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.LargeTest
@@ -86,6 +89,7 @@ Target tests: 
  Test3

  SystemUiRavenTests

RAVENWOOD_TEST_ENABLEMENT_POLICY=/tmp/ravenwood-enablement-@@@-@@@.txt

Test "RavenwoodUiTest_exp" can use experimental APIs.

Running: echo atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 Test2 Test3 SystemUiRavenTests -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest

atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 Test2 Test3 SystemUiRavenTests -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest
@@ -110,6 +114,7 @@ Target tests: 
Excluded tests:

< SystemUiRavenTests

RAVENWOOD_TEST_ENABLEMENT_POLICY=/tmp/ravenwood-enablement-@@@-@@@.txt

Test "RavenwoodUiTest_exp" can use experimental APIs.

Running: echo atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 Test2 Test3 -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg RavenwoodCoreTest:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.LargeTest

atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 Test2 Test3 -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg RavenwoodCoreTest:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.LargeTest
@@ -136,6 +141,7 @@ Excluded tests: 
> TestX

> TestY

RAVENWOOD_TEST_ENABLEMENT_POLICY=/tmp/ravenwood-enablement-@@@-@@@.txt

Test "RavenwoodUiTest_exp" can use experimental APIs.

Running: echo atest --class-level-report TestX TestY -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg RavenwoodCoreTest:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.LargeTest

atest --class-level-report TestX TestY -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg RavenwoodCoreTest:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.LargeTest
@@ -162,6 +168,7 @@ Excluded tests: 
> TestX

> TestY

RAVENWOOD_TEST_ENABLEMENT_POLICY=/tmp/ravenwood-enablement-@@@-@@@.txt

Test "RavenwoodUiTest_exp" can use experimental APIs.

Running: echo atest --class-level-report TestX TestY -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg RavenwoodCoreTest:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.LargeTest

atest --class-level-report TestX TestY -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg RavenwoodCoreTest:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test1:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test2:exclude-annotation:androidx.test.filters.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg Test3:exclude-annotation:androidx.test.filters.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:android.platform.test.annotations.LargeTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.LargeTest
@@ -184,6 +191,7 @@ Excluded tests: 
< RavenwoodCoreTest

< SystemUiRavenTests

RAVENWOOD_TEST_ENABLEMENT_POLICY=/tmp/ravenwood-enablement-@@@-@@@.txt

Test "RavenwoodUiTest_exp" can use experimental APIs.

Running: echo atest --class-level-report Test2 Test3 -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest

atest --class-level-report Test2 Test3 -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest
@@ -204,6 +212,7 @@ Target tests: 
  Test1

  SystemUiRavenTests

RAVENWOOD_TEST_ENABLEMENT_POLICY=/tmp/ravenwood-enablement-@@@-@@@.txt

Test "RavenwoodUiTest_exp" can use experimental APIs.

Running: echo atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 SystemUiRavenTests -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest

atest --class-level-report hoststubgentest tiny-framework-dump-test hoststubgen-invoke-test ravenwood-stats-checker ravenhelpertest ravenwood-scripts-sh-golden-test RavenwoodCoreTest Test1 SystemUiRavenTests -- --module-arg RavenwoodCoreTest:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test2:exclude-annotation:androidx.test.filters.FlakyTest --module-arg Test3:exclude-annotation:androidx.test.filters.FlakyTest --module-arg SystemUiRavenTests:exclude-annotation:androidx.test.filters.FlakyTest
@@ -217,6 +226,7 @@ Target tests: 
  DeviceTest1

  DeviceTest2

RAVENWOOD_TEST_ENABLEMENT_POLICY=/tmp/ravenwood-enablement-@@@-@@@.txt

Test "RavenwoodUiTest_exp" can use experimental APIs.

Running: echo atest --class-level-report DeviceTest1 DeviceTest2 -- --module-arg DeviceTest1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg DeviceTest2:exclude-annotation:androidx.test.filters.FlakyTest

atest --class-level-report DeviceTest1 DeviceTest2 -- --module-arg DeviceTest1:exclude-annotation:androidx.test.filters.FlakyTest --module-arg DeviceTest2:exclude-annotation:androidx.test.filters.FlakyTest

== All commands finished ==

ravenwood/tests/uitest/Android.bp

+23 −5
Original line number Diff line number Diff line
@@ -9,27 +9,45 @@ package { 


java_defaults {

    name: "ravenwood-uitest-defaults",

    srcs: [

        "test/**/*.java",

    ],

    static_libs: [

        "androidx.annotation_annotation",

        "androidx.test.ext.junit",

        "androidx.test.rules",

        "truth",

        "compatibility-device-util-axt",

    ],

    srcs: [

        "test/**/*.java",

    libs: [

        "ravenwood-junit-impl",

    ],

    uses_libs: [

        "android.test.runner",

        "android.test.base",

    ],

    ravenizer: {

        strip_mockito: true,

    },

    auto_gen_config: true,



    package_name: "com.android.ravenwoodtest.uitest",

    build_resources: true,

}



// UI Test, we run it without enabling the experimental APIs.

// This is what we run in presubmit too.

android_ravenwood_test {

    name: "RavenwoodUiTest",

    name: "RavenwoodUiTest_noexp",

    defaults: ["ravenwood-uitest-defaults"],

}



// Alias to RavenwoodUiTest_noexp.

// Using a different name for the same test module allows us to run

// it with experimental APIs enabled.

android_ravenwood_test {

    name: "RavenwoodUiTest_exp",

    defaults: ["ravenwood-uitest-defaults"],

    package_name: "com.android.ravenwoodtest.uitest",

    build_resources: true,

}



android_test {