diff options
author | Vadim Tryshev <vadimt@google.com> | 2019-09-20 18:25:52 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-20 18:25:52 -0700 |
commit | 7cb5a6e97341ef4d41de04d491fb820c3e93bae8 (patch) | |
tree | a4351a92a07198f517f9a37b7353066cd0a70be0 /tests/src | |
parent | 521224131ea7a2d52fe58d82079baef5158c3d54 (diff) | |
parent | f8a9a14acaaae9613b54b50f7fa4c81bcdaa97ff (diff) | |
download | android_packages_apps_Trebuchet-7cb5a6e97341ef4d41de04d491fb820c3e93bae8.tar.gz android_packages_apps_Trebuchet-7cb5a6e97341ef4d41de04d491fb820c3e93bae8.tar.bz2 android_packages_apps_Trebuchet-7cb5a6e97341ef4d41de04d491fb820c3e93bae8.zip |
Merge "Adding recognition of R launcher builds for test stability rule" into ub-launcher3-qt-qpr1-dev
am: f8a9a14aca
Change-Id: I0eb777bd191da9708976431a944fc7441c1800ff
Diffstat (limited to 'tests/src')
-rw-r--r-- | tests/src/com/android/launcher3/util/rule/TestStabilityRule.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java index 8391ae713..8feadbee9 100644 --- a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java +++ b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java @@ -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; |