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

Commit f8a9a14a authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Adding recognition of R launcher builds for test stability rule" into... 

Merge "Adding recognition of R launcher builds for test stability rule" into ub-launcher3-qt-qpr1-dev
parents 5c229885 fc041efe

tests/src/com/android/launcher3/util/rule/TestStabilityRule.java

+6 −7
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ public class TestStabilityRule implements TestRule { 
    private static final String TAG = "TestStabilityRule";

    private static final Pattern LAUNCHER_BUILD =

            Pattern.compile("^("

                    + "(?<androidStudio>BuildFromAndroidStudio)|"

                    + "(?<commandLine>[0-9]+-eng\\.[a-z]+\\.[0-9]+\\.[0-9]+)|"

                    + "(?<presubmit>[0-9]+-P[0-9]+)|"

                    + "(?<postsubmit>[0-9]+-[0-9]+|"

                    + "(?<platform>[0-9]+))"

                    + "(?<local>(BuildFromAndroidStudio|"

                    + "([0-9]+|[A-Z])-eng\\.[a-z]+\\.[0-9]+\\.[0-9]+))|"

                    + "(?<presubmit>([0-9]+|[A-Z])-P[0-9]+)|"

                    + "(?<postsubmit>([0-9]+|[A-Z])+-[0-9]+|"

                    + "(?<platform>([0-9]+|[A-Z])+))"

                    + ")$");

    private static final Pattern PLATFORM_BUILD =

            Pattern.compile("^("
@@ -80,8 +80,7 @@ public class TestStabilityRule implements TestRule { 


                    if (!launcherBuildMatcher.find()) {

                        Log.e(TAG, "Match not found");

                    } else if (launcherBuildMatcher.group("androidStudio") != null

                            || launcherBuildMatcher.group("commandLine") != null) {

                    } else if (launcherBuildMatcher.group("local") != null) {

                        launcherLocalBuild = true;

                    } else if (launcherBuildMatcher.group("presubmit") != null) {

                        launcherUnbundledPresubmit = true;