walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Catch exceptions in main() only if NDEBUG is defined

This commit is contained in:
PKEuS 2014-09-28 09:51:18 +02:00
parent 03b1afc28c
commit 73171b0bc7
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/main.cpp
View File

@ -123,8 +123,11 @@ int main(int argc, char* argv[])
argv[0] = exename; argv[0] = exename;
#endif #endif
#ifdef NDEBUG
try { try {
#endif
return exec.check(argc, argv); return exec.check(argc, argv);
#ifdef NDEBUG
} catch (const InternalError& e) { } catch (const InternalError& e) {
printf("%s\n", e.errorMessage.c_str()); printf("%s\n", e.errorMessage.c_str());
} catch (const std::exception& error) { } catch (const std::exception& error) {
@ -133,6 +136,7 @@ int main(int argc, char* argv[])
printf("Unknown exception\n"); printf("Unknown exception\n");
} }
return EXIT_FAILURE; return EXIT_FAILURE;
#endif
} }

4
test/testrunner.cpp
View File

@ -23,11 +23,14 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef NDEBUG
try { try {
#endif
options args(argc, const_cast<const char**>(argv)); options args(argc, const_cast<const char**>(argv));
std::size_t failedTestsCount = TestFixture::runTests(args); std::size_t failedTestsCount = TestFixture::runTests(args);
return (failedTestsCount == 0) ? EXIT_SUCCESS : EXIT_FAILURE; return (failedTestsCount == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
#ifdef NDEBUG
} catch (const InternalError& e) { } catch (const InternalError& e) {
printf("%s\n", e.errorMessage.c_str()); printf("%s\n", e.errorMessage.c_str());
} catch (const std::exception& error) { } catch (const std::exception& error) {
@ -36,4 +39,5 @@ int main(int argc, char *argv[])
printf("Unknown exception\n"); printf("Unknown exception\n");
} }
return EXIT_FAILURE; return EXIT_FAILURE;
#endif
} }