nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

r13384@catbus: nickm | 2007-06-13 13:53:26 -0400

Browse Source 
make test_* functions stop conflicting with variables named v1 and v2.


svn:r10584
This commit is contained in:
Nick Mathewson 2007-06-13 18:15:56 +00:00
parent 3637ee0e59
commit 546209a4de
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/test.h
View File

@ -51,9 +51,9 @@ extern int have_failed;
#define test_eq_type(tp, fmt, expr1, expr2) \ #define test_eq_type(tp, fmt, expr1, expr2) \
STMT_BEGIN \ STMT_BEGIN \
tp v1=(tp)(expr1); \ tp _test_v1=(tp)(expr1); \
tp v2=(tp)(expr2); \ tp _test_v2=(tp)(expr2); \
if (v1==v2) { printf("."); fflush(stdout); } else { \ if (_test_v1==_test_v2) { printf("."); fflush(stdout); } else { \
have_failed = 1; \ have_failed = 1; \
printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n" \ printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n" \
" "fmt "!="fmt"\n", \ " "fmt "!="fmt"\n", \
@ -61,7 +61,7 @@ extern int have_failed;
__LINE__, \ __LINE__, \
PRETTY_FUNCTION, \ PRETTY_FUNCTION, \
#expr1, #expr2, \ #expr1, #expr2, \
v1, v2); \ _test_v1, _test_v2); \
return; \ return; \
} STMT_END } STMT_END
@ -73,9 +73,9 @@ extern int have_failed;
#define test_neq_type(tp, fmt, expr1, expr2) \ #define test_neq_type(tp, fmt, expr1, expr2) \
STMT_BEGIN \ STMT_BEGIN \
tp v1=(tp)(expr1); \ tp _test_v1=(tp)(expr1); \
tp v2=(tp)(expr2); \ tp _test_v2=(tp)(expr2); \
if (v1!=v2) { printf("."); fflush(stdout); } else { \ if (_test_v1!=_test_v2) { printf("."); fflush(stdout); } else { \
have_failed = 1; \ have_failed = 1; \
printf("\nFile %s: line %d (%s): Assertion failed: (%s!=%s)\n" \ printf("\nFile %s: line %d (%s): Assertion failed: (%s!=%s)\n" \
" ("fmt" == "fmt")\n", \ " ("fmt" == "fmt")\n", \
@ -83,7 +83,7 @@ extern int have_failed;
__LINE__, \ __LINE__, \
PRETTY_FUNCTION, \ PRETTY_FUNCTION, \
#expr1, #expr2, \ #expr1, #expr2, \
v1, v2); \ _test_v1, _test_v2); \
return; \ return; \
} STMT_END } STMT_END
@ -95,8 +95,8 @@ extern int have_failed;
#define test_streq(expr1, expr2) \ #define test_streq(expr1, expr2) \
STMT_BEGIN \ STMT_BEGIN \
const char *v1=(expr1), *v2=(expr2); \ const char *_test_v1=(expr1), *_test_v2=(expr2); \
if (!strcmp(v1,v2)) { printf("."); fflush(stdout); } else { \ if (!strcmp(_test_v1,_test_v2)) { printf("."); fflush(stdout); } else { \
have_failed = 1; \ have_failed = 1; \
printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n"\ printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n"\
" (\"%s\" != \"%s\")\n", \ " (\"%s\" != \"%s\")\n", \
@ -104,14 +104,14 @@ extern int have_failed;
__LINE__, \ __LINE__, \
PRETTY_FUNCTION, \ PRETTY_FUNCTION, \
#expr1, #expr2, \ #expr1, #expr2, \
v1, v2); \ _test_v1, _test_v2); \
return; \ return; \
} STMT_END } STMT_END
#define test_strneq(expr1, expr2) \ #define test_strneq(expr1, expr2) \
STMT_BEGIN \ STMT_BEGIN \
const char *v1=(expr1), *v2=(expr2); \ const char *_test_v1=(expr1), *_test_v2=(expr2); \
if (strcmp(v1,v2)) { printf("."); fflush(stdout); } else { \ if (strcmp(_test_v1,_test_v2)) { printf("."); fflush(stdout); } else { \
have_failed = 1; \ have_failed = 1; \
printf("\nFile %s: line %d (%s): Assertion failed: (%s!=%s)\n"\ printf("\nFile %s: line %d (%s): Assertion failed: (%s!=%s)\n"\
" (\"%s\" == \"%s\")\n", \ " (\"%s\" == \"%s\")\n", \
@ -119,14 +119,15 @@ extern int have_failed;
__LINE__, \ __LINE__, \
PRETTY_FUNCTION, \ PRETTY_FUNCTION, \
#expr1, #expr2, \ #expr1, #expr2, \
v1, v2); \ _test_v1, _test_v2); \
return; \ return; \
} STMT_END } STMT_END
#define test_memeq(expr1, expr2, len) \ #define test_memeq(expr1, expr2, len) \
STMT_BEGIN \ STMT_BEGIN \
const void *v1=(expr1), *v2=(expr2); \ const void *_test_v1=(expr1), *_test_v2=(expr2); \
if (!memcmp(v1,v2,(len))) { printf("."); fflush(stdout); } else {\ if (!memcmp(_test_v1,_test_v2,(len))) { \
printf("."); fflush(stdout); } else { \
have_failed = 1; \ have_failed = 1; \
printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n", \ printf("\nFile %s: line %d (%s): Assertion failed: (%s==%s)\n", \
_SHORT_FILE_, \ _SHORT_FILE_, \
@ -138,8 +139,10 @@ extern int have_failed;
#define test_memneq(expr1, expr2, len) \ #define test_memneq(expr1, expr2, len) \
STMT_BEGIN \ STMT_BEGIN \
void *v1=(expr1), *v2=(expr2); \ void *_test_v1=(expr1), *_test_v2=(expr2); \
if (memcmp(v1,v2,(len))) { printf("."); fflush(stdout); } else {\ if (memcmp(_test_v1,_test_v2,(len))) { \
printf("."); fflush(stdout); \
} else { \
have_failed = 1; \ have_failed = 1; \
printf("\nFile %s: line %d (%s): Assertion failed: (%s!=%s)\n", \ printf("\nFile %s: line %d (%s): Assertion failed: (%s!=%s)\n", \
_SHORT_FILE_, \ _SHORT_FILE_, \