Fix a problem with [terminateApplicationWithID] not working reliably.

Just kill it, it’s old school cool.

Author: ob

Bluepill-cli/Bluepill-cli/Simulator/SimulatorMonitor.m

@@ -204,15 +204,15 @@ - (void)onOutputReceived:(NSString *)output {
 }
 
 - (void)stopTestsWithErrorMessage:(NSString *)message forTestName:(NSString *)testName inClass:(NSString *)testClass {
-    NSError *error = nil;
 
     // Timeout or crash on a test means we should skip it when we rerun the tests
     [self updateExecutedTestCaseList:testName inClass:testClass];
 
     if (![[self.device stateString] isEqualToString:@"Shutdown"]) {
-        [self.device terminateApplicationWithID:self.hostBundleId error:&error];
-        if (error) {
-            fprintf(stderr, "stopTests: %s\n", [[error description] UTF8String]);
+        // self.appPID can be zero when running the parsing tests
+        // since we're not actually creating a simulator and running an app.
+        if (self.appPID && (kill(self.appPID, SIGTERM) < 0)) {
+            perror("kill");
         }
     }
 

Bluepill-cli/Bluepill-cli/Simulator/SimulatorRunner.m

@@ -283,6 +283,7 @@ - (void)launchApplicationAndExecuteTestsWithParser:(BPTreeParser *)parser andCom
                 dispatch_source_cancel(source);
             });
             __block __weak SimulatorRunner *weakSelf = self;
+            weakSelf.monitor.appPID = pid;
             dispatch_source_set_cancel_handler(source, ^{
                 // Post a APPCLOSED signal to the fifo
                 [weakSelf.stdOutHandle writeData:[@"\nBP_APP_PROC_ENDED\n" dataUsingEncoding:NSUTF8StringEncoding]];