Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -97,6 +97,8 @@ namespace NUnit.ConsoleRunner
testFilter = new AndFilter( testFilter, excludeFilter );
}
testFilter = BabysitterSupport.AddBabysitterFilter(testFilter);
TestResult result = null;
string savedDirectory = Environment.CurrentDirectory;
TextWriter savedOut = Console.Out;
@@ -158,7 +160,7 @@ namespace NUnit.ConsoleRunner
//if ( testRunner != null )
// testRunner.Unload();
if ( collector.HasExceptions )
if ( result == null || collector.HasExceptions )
{
collector.WriteExceptions();
return UNEXPECTED_ERROR;

View File

@@ -98,6 +98,8 @@ namespace NUnit.ConsoleRunner
}
}
}
BabysitterSupport.RecordFailedTest(currentTestName);
}
}
else