From 6583284731e961065f007782eb89be41e6ef4e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Tue, 6 Jun 2017 15:12:03 +0200 Subject: [PATCH] Fix erroneous result disposition for {REQUIRE,CHECK}_THAT This fixes result disposition being ContinueOnFailure | ContinueOnFailure for CHECK_THAT (obviously an error) and Normal | ContinueOnFailure for REQUIRE_THAT (less obviously an error, but worse, as that signals to the pipeline that assertion failure should both abort and continue the test with ???? happening). --- include/internal/catch_capture.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index 7816b50c..b25f13e8 100644 --- a/include/internal/catch_capture.hpp +++ b/include/internal/catch_capture.hpp @@ -162,7 +162,7 @@ try { \ __catchResult.captureMatch( arg, matcher, #matcher ); \ } catch( ... ) { \ - __catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \ + __catchResult.useActiveException( resultDisposition ); \ } \ INTERNAL_CATCH_REACT( __catchResult ) \ } while( Catch::alwaysFalse() )