[RunInstrumentationTests] Error on test failure

The instrumentatione exit code value of `-1` indicates success, and any
other values returned here should be reported as errors. A non `-1` value
indicates that crash or test failure occurred.

Author: pjcollins

build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunInstrumentationTests.cs

@@ -14,6 +14,7 @@ public class RunInstrumentationTests : Adb
 		const                   string              TestResultsPathResult       = "INSTRUMENTATION_RESULT: nunit2-results-path=";
 		internal const          string              AdbRestartText              = "daemon not running; starting now at tcp:";
 		internal const          string              AdbCrashErrorText           = "The adb might have crashed and was restarted. ";
+		const                   string              ExitCodeName                = "INSTRUMENTATION_CODE: ";
 		const                   int                 StateRunInstrumentation     = 0;
 		const                   int                 StateGetLogcat              = 1;
 		const                   int                 StateClearLogcat            = 2;
@@ -41,8 +42,8 @@ public class RunInstrumentationTests : Adb
 		public                  string              LogLevel                    { get; set; }
 
 		int                     currentState = -1;
+		int                     exitCode = 99;
 		string                  targetTestResultsPath;
-		TextWriter              logcatWriter;
 
 		bool                    adbRestarted;
 
@@ -69,6 +70,14 @@ public override bool Execute ()
 				return false;
 			}
 
+			if (exitCode != -1) {
+				FailedToRun = Component;
+				Log.LogError (
+					$"Instrumentation for component `{Component}` did not exit successfully. " +
+					"Process crashed or test failures occurred!");
+				return false;
+			}
+
 			return !Log.HasLoggedErrors;
 		}
 
@@ -135,11 +144,15 @@ protected override void ProcessStdout (string line)
 			if (currentState != StateRunInstrumentation || String.IsNullOrEmpty (line))
 				return;
 
-			int i = line.IndexOf (TestResultsPathResult, StringComparison.OrdinalIgnoreCase);
-			if (i < 0)
-				return;
+			int testResultIndex = line.IndexOf (TestResultsPathResult, StringComparison.OrdinalIgnoreCase);
+			int exitCodeIndex = line.IndexOf (ExitCodeName, StringComparison.OrdinalIgnoreCase);
 
-			targetTestResultsPath = line.Substring (i + TestResultsPathResult.Length).Trim ();
+			if (testResultIndex < 0 && exitCodeIndex < 0)
+				return;
+			else if (testResultIndex >= 0)
+				targetTestResultsPath = line.Substring (testResultIndex + TestResultsPathResult.Length).Trim ();
+			else if (exitCodeIndex >= 0)
+				exitCode = int.Parse (line.Substring (exitCodeIndex + ExitCodeName.Length).Trim ());
 		}
 	}
 }