From b712a172f9694745f50505c93340883493b505e5 Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Tue, 9 Jul 2019 13:14:38 -0700 Subject: [PATCH] Fixed logLevel filter bug so that filter now works as expected (#35777) Cherry-pick https://github.com/flutter/engine/pull/9717 --- bin/internal/engine.version | 2 +- dev/bots/test.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index 96e1d7d19a0ddc..5a1ccbd7745a73 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -b1cb0d9e9b44393efeb735f664672a74732cdc8b +54ad777fd29b031b87c7a68a6637fb48c0932862 diff --git a/dev/bots/test.dart b/dev/bots/test.dart index 4c8fde19cc5568..41bf4673910f40 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -787,10 +787,10 @@ Future _verifyVersion(String filename) async { print('$redLine'); exit(1); } - final RegExp pattern = RegExp(r'^\d+\.\d+\.\d+(?:|-pre\.\d+|\+hotfix\.\d+)$'); + final RegExp pattern = RegExp(r'^\d+\.\d+\.\d+(?:|-pre\.\d+|\+hotfix\.\d+(-pre\.\d+)?)$'); if (!version.contains(pattern)) { print('$redLine'); - print('The version logic generated an invalid version string.'); + print('The version logic generated an invalid version string ($version).'); print('$redLine'); exit(1); }