luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: log the test result code after each libtest

Browse Source 
This makes it easier to determine the test status. Also, capitalize
FAILURE and ABORT messages in log lines to make them easier to spot.
This commit is contained in:
Dan Fandrich 2023-09-13 11:31:16 -07:00
parent 3aa3cc9b05
commit 06cdfad49f
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/libtest/first.c
View File

@ -172,6 +172,7 @@ int main(int argc, char **argv)
fprintf(stderr, "URL: %s\n", URL);
result = test(URL);
fprintf(stderr, "Test ended with result %d\n", result);
#ifdef WIN32
/* flush buffers of all streams regardless of mode */

32
tests/unit/curlcheck.h
View File

@ -24,19 +24,19 @@
#include "test.h"
/* The fail macros mark the current test step as failed, and continue */
#define fail_if(expr, msg) \
do { \
if(expr) { \
fprintf(stderr, "%s:%d Assertion '%s' met: %s\n", \
__FILE__, __LINE__, #expr, msg); \
unitfail++; \
} \
#define fail_if(expr, msg) \
do { \
if(expr) { \
fprintf(stderr, "%s:%d FAILED Assertion '%s' met: %s\n", \
__FILE__, __LINE__, #expr, msg); \
unitfail++; \
} \
} while(0)
#define fail_unless(expr, msg) \
do { \
if(!(expr)) { \
fprintf(stderr, "%s:%d Assertion '%s' failed: %s\n", \
fprintf(stderr, "%s:%d Assertion '%s' FAILED: %s\n", \
__FILE__, __LINE__, #expr, msg); \
unitfail++; \
} \
@ -44,9 +44,9 @@
#define verify_memory(dynamic, check, len) \
do { \
if(dynamic && memcmp(dynamic, check, len)) { \
fprintf(stderr, "%s:%d Memory buffer mismatch size %d. '%s' is not\n", \
__FILE__, __LINE__, len, \
if(dynamic && memcmp(dynamic, check, len)) { \
fprintf(stderr, "%s:%d Memory buffer FAILED match size %d. " \
"'%s' is not\n", __FILE__, __LINE__, len, \
hexdump((const unsigned char *)check, len)); \
fprintf(stderr, "%s:%d the same as '%s'\n", __FILE__, __LINE__, \
hexdump((const unsigned char *)dynamic, len)); \
@ -57,7 +57,7 @@
/* fail() is for when the test case figured out by itself that a check
proved a failure */
#define fail(msg) do { \
fprintf(stderr, "%s:%d test failed: '%s'\n", \
fprintf(stderr, "%s:%d test FAILED: '%s'\n", \
__FILE__, __LINE__, msg); \
unitfail++; \
} while(0)
@ -67,7 +67,7 @@
#define abort_if(expr, msg) \
do { \
if(expr) { \
fprintf(stderr, "%s:%d Abort assertion '%s' met: %s\n", \
fprintf(stderr, "%s:%d ABORT assertion '%s' met: %s\n", \
__FILE__, __LINE__, #expr, msg); \
unitfail++; \
goto unit_test_abort; \
@ -77,7 +77,7 @@
#define abort_unless(expr, msg) \
do { \
if(!(expr)) { \
fprintf(stderr, "%s:%d Abort assertion '%s' failed: %s\n", \
fprintf(stderr, "%s:%d ABORT assertion '%s' failed: %s\n", \
__FILE__, __LINE__, #expr, msg); \
unitfail++; \
goto unit_test_abort; \
@ -86,7 +86,7 @@
#define abort_test(msg) \
do { \
fprintf(stderr, "%s:%d test aborted: '%s'\n", \
fprintf(stderr, "%s:%d test ABORTED: '%s'\n", \
__FILE__, __LINE__, msg); \
unitfail++; \
goto unit_test_abort; \
@ -100,7 +100,7 @@ extern int unitfail;
{ \
(void)arg; \
if(unit_setup()) { \
fail("unit_setup() failure"); \
fail("unit_setup() FAILURE"); \
} \
else {