-
Notifications
You must be signed in to change notification settings - Fork 232
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Minor fixes for XCode 9.1 #207
Changes from 8 commits
0b9b1ca
725cfaa
2808ce1
d3813b6
3f0614e
e72ba62
bc4003c
9e010a6
7403a4d
a1df0cf
c5a9219
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -65,13 +65,15 @@ @implementation BPApp | |
|
||
+ (NSArray <BPXCTestFile *>*)testsFromXCTestRunDict:(NSDictionary *)xcTestRunDict | ||
andXCTestRunPath:(NSString *)xcTestRunPath | ||
andXcodePath: (NSString *)xcodePath | ||
withError:(NSError *__autoreleasing *)error { | ||
|
||
NSMutableArray<BPXCTestFile *> *allTests = [[NSMutableArray alloc] init]; | ||
NSUInteger errorCount = 0; | ||
for (NSString *key in xcTestRunDict) { | ||
BPXCTestFile *xcTestFile = [BPXCTestFile BPXCTestFileFromDictionary:[xcTestRunDict objectForKey:key] | ||
withTestRoot:[xcTestRunPath stringByDeletingLastPathComponent] | ||
andXcodePath:xcodePath | ||
andError:error]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. indent is wrong |
||
if (!xcTestFile) { | ||
[BPUtils printInfo:ERROR withString:@"Failed to read data for %@", key]; | ||
|
@@ -98,6 +100,7 @@ + (instancetype)appWithConfig:(BPConfiguration *)config | |
[BPUtils printInfo:INFO withString:@"Using xctestrun configuration"]; | ||
NSArray<BPXCTestFile *> *loadedTests = [BPApp testsFromXCTestRunDict:config.xcTestRunDict | ||
andXCTestRunPath:config.xcTestRunPath | ||
andXcodePath:config.xcodePath | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. indent |
||
withError:error]; | ||
if (loadedTests == nil) { | ||
return nil; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -73,7 +73,8 @@ int main(int argc, char * argv[]) { | |
|
||
//Check if Bluepill compile time Xcode version is matched with Bluepill runtime Xcode version | ||
//Senario to prevent: Bluepill is compiled with Xcode 8, but runs with host installed with Xcode 9 | ||
if ([[BPUtils getXcodeRuntimeVersion] isEqualToString:@XCODE_VERSION]) { | ||
//Only compare major version Exg. 9.1 == 9.1 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. major and minor version (not comparing patch version) |
||
if ([[[BPUtils getXcodeRuntimeVersion] substringToIndex:3] isEqualToString:[@XCODE_VERSION substringToIndex:3]]) { | ||
printf("Bluepill runtime version and compile time version are matched: %s\n", XCODE_VERSION); | ||
} else { | ||
fprintf(stderr, "ERROR: Bluepill runtime version %s and compile time version %s are mismatched\n", [[BPUtils getXcodeRuntimeVersion] UTF8String], XCODE_VERSION); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we should also update the error msg to only use substring to index 3.. otherwise people would think you need the exact patch version |
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
machine: | ||
xcode: | ||
version: 9.0 | ||
version: 9.1 | ||
|
||
compile: | ||
override: | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extra space