Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

src: improve error message when using doctest options like '--dt-help'; add

Browse Source 
doctest info to help.cpp
This commit is contained in:
Markus F.X.J. Oberhumer
2022-10-24 23:00:12 +02:00
parent 98fedef1a1
commit 983eb6d676
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/dt_check.cpp
+8 -6
View File
@@ -31,14 +31,14 @@
// upx_doctest_check()
**************************************************************************/
bool upx_doctest_check(int argc, char **argv) {
int upx_doctest_check(int argc, char **argv) {
#if defined(DOCTEST_CONFIG_DISABLE)
UNUSED(argc);
UNUSED(argv);
#else
const char *e = getenv("UPX_DEBUG_DOCTEST_DISABLE");
if (e && e[0] && strcmp(e, "0") != 0)
return true;
return 0;
bool minimal = true; // only show failing tests
bool duration = false; // show timings
bool success = false; // show all tests
@@ -68,13 +68,15 @@ bool upx_doctest_check(int argc, char **argv) {
if (argc > 0 && argv != nullptr)
context.applyCommandLine(argc, argv);
int r = context.run();
if (context.shouldExit() || r != 0)
return false;
if (r != 0)
return 1;
if (context.shouldExit())
return 2;
#endif // DOCTEST_CONFIG_DISABLE
return true;
return 0;
}
bool upx_doctest_check() { return upx_doctest_check(0, nullptr); }
int upx_doctest_check() { return upx_doctest_check(0, nullptr); }
/*************************************************************************
// compile-time checks