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

Unified Diff: testing/iossim/iossim.mm

Issue 2167713005: Correct iossim for partial availability on latest Xcode beta. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months 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 | « no previous file | no next file » | 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 a1b174c4fa8bfc4c759d6122413fa8de4e2d74e0..f1f0ca86c6e345b59caad9aa46cbf4d9ef8ead24 100644
--- a/testing/iossim/iossim.mm
+++ b/testing/iossim/iossim.mm
@@ -259,18 +259,22 @@ void RunApplication(NSString* app_path,
@"test-without-building"
]] autorelease];
- // The following stderr messages are meaningless on iossim when not running
- // xctests and can be safely stripped.
if (!xctest_path) {
+ // The following stderr messages are meaningless on iossim when not running
+ // xctests and can be safely stripped.
+ NSArray* ignore_strings = @[
+ @"IDETestOperationsObserverErrorDomain", @"** TEST EXECUTE FAILED **"
+ ];
NSPipe* stderr_pipe = [NSPipe pipe];
stderr_pipe.fileHandleForReading.readabilityHandler =
^(NSFileHandle* handle) {
NSString* log = [[[NSString alloc] initWithData:handle.availableData
encoding:NSUTF8StringEncoding]
autorelease];
- if ([log containsString:@"IDETestOperationsObserverErrorDomain"] ||
- [log containsString:@"** TEST EXECUTE FAILED **"]) {
- return;
+ for (NSString* ignore_string in ignore_strings) {
+ if ([log rangeOfString:ignore_string].location != NSNotFound) {
+ return;
+ }
}
printf("%s", [log UTF8String]);
};
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698