summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorlliabraa@chromium.org <lliabraa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 21:51:25 +0000
committerlliabraa@chromium.org <lliabraa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 21:51:25 +0000
commit21f60461517d9378d0f8aa195849ea56477c7cc0 (patch)
treea51f7d0a1b343e9445f761bc1a6aa24609f15583 /testing
parente7227e550e7298f07bb6f5f96a39a1137054ebdd (diff)
downloadchromium_src-21f60461517d9378d0f8aa195849ea56477c7cc0.zip
chromium_src-21f60461517d9378d0f8aa195849ea56477c7cc0.tar.gz
chromium_src-21f60461517d9378d0f8aa195849ea56477c7cc0.tar.bz2
Fix iossim to only check for crashes from the simulated app.
When attempting to check for crashes, iossim was not taking into account the ID or PID of the simulated app so if *any* app crashed while the simulated app was running, iossim would report that the simulated app crashed and return non-zero status code. BUG=None Review URL: https://codereview.chromium.org/431093003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rw-r--r--testing/iossim/iossim.mm5
1 files changed, 4 insertions, 1 deletions
diff --git a/testing/iossim/iossim.mm b/testing/iossim/iossim.mm
index 6fda2ca..48482e8 100644
--- a/testing/iossim/iossim.mm
+++ b/testing/iossim/iossim.mm
@@ -440,9 +440,12 @@ void PrintSupportedDevices() {
error:NULL];
NSArray* lines = [content componentsSeparatedByCharactersInSet:
[NSCharacterSet newlineCharacterSet]];
+ NSString* simulatedAppPID =
+ [NSString stringWithFormat:@"%d", session.simulatedApplicationPID];
for (NSString* line in lines) {
NSString* const kErrorString = @"Service exited with abnormal code:";
- if ([line rangeOfString:kErrorString].location != NSNotFound) {
+ if ([line rangeOfString:kErrorString].location != NSNotFound &&
+ [line rangeOfString:simulatedAppPID].location != NSNotFound) {
LogWarning(@"Console message: %@", line);
badEntryFound = YES;
break;