Add support for Managed tests in VS2010 & VS2012. Add support for Native tests in VS2012

This commit is contained in:
Malcolm Noyes
2013-11-17 14:18:02 +00:00
parent 3a6ab65c82
commit 907f514de7
42 changed files with 3129 additions and 814 deletions

View File

@@ -277,9 +277,15 @@ namespace Catch {
}
duration = timer.getElapsedSeconds();
}
catch( TestFailureException& ) {
#ifdef INTERNAL_CATCH_VS_MANAGED // detect CLR
catch(AssertFailedException^) {
throw; // CLR always rethrows - stop on first assert
}
#else
catch( INTERNAL_CATCH_TEST_FAILURE_EXCEPTION ) {
// This just means the test was aborted due to failure
}
#endif
catch(...) {
ExpressionResultBuilder exResult( ResultWas::ThrewException );
exResult << translateActiveException();