Ensure pending scheduled callbacks have executed in "run" APIs
This commit is contained in:
@ -678,6 +678,11 @@ static inline NSString* _EncodeBase64(NSString* string) {
|
|||||||
[self stop];
|
[self stop];
|
||||||
success = YES;
|
success = YES;
|
||||||
}
|
}
|
||||||
|
while (1) {
|
||||||
|
if (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, true) == kCFRunLoopRunTimedOut) { // Ensure pending scheduled callbacks have been executed
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
signal(SIGINT, intHandler);
|
signal(SIGINT, intHandler);
|
||||||
signal(SIGTERM, termHandler);
|
signal(SIGTERM, termHandler);
|
||||||
}
|
}
|
||||||
@ -966,6 +971,7 @@ static void _LogResult(NSString* format, ...) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (NSInteger)runTestsWithOptions:(NSDictionary*)options inDirectory:(NSString*)path {
|
- (NSInteger)runTestsWithOptions:(NSDictionary*)options inDirectory:(NSString*)path {
|
||||||
|
DCHECK([NSThread isMainThread]);
|
||||||
NSArray* ignoredHeaders = @[@"Date", @"Etag"]; // Dates are always different by definition and ETags depend on file system node IDs
|
NSArray* ignoredHeaders = @[@"Date", @"Etag"]; // Dates are always different by definition and ETags depend on file system node IDs
|
||||||
NSInteger result = -1;
|
NSInteger result = -1;
|
||||||
if ([self startWithOptions:options error:NULL]) {
|
if ([self startWithOptions:options error:NULL]) {
|
||||||
@ -1069,6 +1075,12 @@ static void _LogResult(NSString* format, ...) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
[self stop];
|
[self stop];
|
||||||
|
|
||||||
|
while (1) {
|
||||||
|
if (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, true) == kCFRunLoopRunTimedOut) { // Ensure pending scheduled callbacks have been executed
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user