matthias/clang-uml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed clang-format target

Browse Source
This commit is contained in:
Bartek Kryza
2021-02-21 21:12:19 +01:00
parent 9e1d7786b9
commit 930ec99adc
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -47,3 +47,4 @@ test: debug
.PHONY: clang-format .PHONY: clang-format
clang-format: clang-format:
docker run --rm -v $(CURDIR):/root/sources bkryza/clang-format-check:1.2 docker run --rm -v $(CURDIR):/root/sources bkryza/clang-format-check:1.2
sudo chown -R $(shell id -u):$(shell id -g) src/*

52
tests/catch.h
View File

@@ -4627,31 +4627,33 @@ auto makeMatchExpr(ArgT const &arg, MatcherT const &matcher,
} while (false) } while (false)
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CATCH_THROWS_MATCHES( \ #define INTERNAL_CATCH_THROWS_MATCHES( \
macroName, exceptionType, resultDisposition, matcher, ...) \ macroName, exceptionType, resultDisposition, matcher, ...) \
do { \ do { \
Catch::AssertionHandler catchAssertionHandler(macroName##_catch_sr, \ Catch::AssertionHandler catchAssertionHandler(macroName##_catch_sr, \
CATCH_INTERNAL_LINEINFO, \ CATCH_INTERNAL_LINEINFO, \
CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) "," \ CATCH_INTERNAL_STRINGIFY( \
" " CATCH_INTERNAL_STRINGIFY( \ __VA_ARGS__) "," \
exceptionType) "," \ " " CATCH_INTERNAL_STRINGIFY( \
" " CATCH_INTERNAL_STRINGIFY(matcher), \ exceptionType) "," \
resultDisposition); \ " " CATCH_INTERNAL_STRINGIFY( \
if (catchAssertionHandler.allowThrows()) \ matcher), \
try { \ resultDisposition); \
static_cast<void>(__VA_ARGS__); \ if (catchAssertionHandler.allowThrows()) \
catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \ try { \
} \ static_cast<void>(__VA_ARGS__); \
catch (exceptionType const &ex) { \ catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
catchAssertionHandler.handleExpr( \ } \
Catch::makeMatchExpr(ex, matcher, #matcher##_catch_sr)); \ catch (exceptionType const &ex) { \
} \ catchAssertionHandler.handleExpr( \
catch (...) { \ Catch::makeMatchExpr(ex, matcher, #matcher##_catch_sr)); \
catchAssertionHandler.handleUnexpectedInflightException(); \ } \
} \ catch (...) { \
else \ catchAssertionHandler.handleUnexpectedInflightException(); \
catchAssertionHandler.handleThrowingCallSkipped(); \ } \
INTERNAL_CATCH_REACT(catchAssertionHandler) \ else \
catchAssertionHandler.handleThrowingCallSkipped(); \
INTERNAL_CATCH_REACT(catchAssertionHandler) \
} while (false) } while (false)
// end catch_capture_matchers.h // end catch_capture_matchers.h