summaryrefslogtreecommitdiffstats
path: root/testing/iossim
diff options
context:
space:
mode:
authorlliabraa <lliabraa@chromium.org>2014-10-29 07:24:37 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-29 14:24:59 +0000
commit51c637fcce891642cd8f9b4987e8808ffb58d5b8 (patch)
tree9bdaeb73548b450af9b79886978d4675dc1f094c /testing/iossim
parenta985241fa25f99f86501be011f6480e0f44a22e1 (diff)
downloadchromium_src-51c637fcce891642cd8f9b4987e8808ffb58d5b8.zip
chromium_src-51c637fcce891642cd8f9b4987e8808ffb58d5b8.tar.gz
chromium_src-51c637fcce891642cd8f9b4987e8808ffb58d5b8.tar.bz2
Update iossim to support iOS 8.1.
iossim was hardcoded for 8.0, so change that to 8.* so test output is send to stdout. BUG=426900 Review URL: https://codereview.chromium.org/689533003 Cr-Commit-Position: refs/heads/master@{#301828}
Diffstat (limited to 'testing/iossim')
-rw-r--r--testing/iossim/iossim.mm6
1 files changed, 5 insertions, 1 deletions
diff --git a/testing/iossim/iossim.mm b/testing/iossim/iossim.mm
index 93081e7..5eaed5c 100644
--- a/testing/iossim/iossim.mm
+++ b/testing/iossim/iossim.mm
@@ -320,7 +320,11 @@ void PrintSupportedDevices() {
#if defined(IOSSIM_USE_XCODE_6)
// With iOS 8 simulators on Xcode 6, the app output is relative to the
// simulator's data directory.
- if ([session.sessionConfig.simulatedSystemRoot.sdkVersion isEqual:@"8.0"]) {
+ NSString* versionString =
+ [[[session sessionConfig] simulatedSystemRoot] sdkVersion];
+ NSInteger majorVersion = [[[versionString componentsSeparatedByString:@"."]
+ objectAtIndex:0] intValue];
+ if (majorVersion >= 8) {
NSString* dataPath = session.sessionConfig.device.dataPath;
NSString* appOutput =
[dataPath stringByAppendingPathComponent:stdioPath_];