PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
am: f8a9a14aca

Change-Id: I0eb777bd191da9708976431a944fc7441c1800ff
This commit is contained in:
Vadim Tryshev
2019-09-20 18:25:52 -07:00
committed by android-build-merger
parent 521224131e f8a9a14aca
commit 7cb5a6e973
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
+6 -7
View File
@@ -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;