Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(741)

Unified Diff: testing/iossim/iossim.mm

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/chromoting/integration_tests.gyp ('k') | third_party/boringssl/boringssl_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/iossim/iossim.mm
diff --git a/testing/iossim/iossim.mm b/testing/iossim/iossim.mm
index 5eaed5c261792b89c6dc913d892cf0cbe9d0a2bb..83cfe9274c9b280dd46f49ef1ee65add4e0deb5d 100644
--- a/testing/iossim/iossim.mm
+++ b/testing/iossim/iossim.mm
@@ -504,13 +504,22 @@ void PrintSupportedDevices() {
[NSCharacterSet newlineCharacterSet]];
NSString* simulatedAppPID =
[NSString stringWithFormat:@"%d", session.simulatedApplicationPID];
+ NSArray* kErrorStrings = @[
+ @"Service exited with abnormal code:",
+ @"Service exited due to signal:",
+ ];
for (NSString* line in lines) {
- NSString* const kErrorString = @"Service exited with abnormal code:";
- if ([line rangeOfString:kErrorString].location != NSNotFound &&
- [line rangeOfString:simulatedAppPID].location != NSNotFound) {
- LogWarning(@"Console message: %@", line);
- badEntryFound = YES;
- break;
+ if ([line rangeOfString:simulatedAppPID].location != NSNotFound) {
+ for (NSString* errorString in kErrorStrings) {
+ if ([line rangeOfString:errorString].location != NSNotFound) {
+ LogWarning(@"Console message: %@", line);
+ badEntryFound = YES;
+ break;
+ }
+ }
+ if (badEntryFound) {
+ break;
+ }
}
}
// Remove the log file so subsequent invocations of iossim won't be
« no previous file with comments | « testing/chromoting/integration_tests.gyp ('k') | third_party/boringssl/boringssl_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698