projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Extend test.
[m6w6/libmemcached]
/
libtest
/
test.h
diff --git
a/libtest/test.h
b/libtest/test.h
index c36572ea00776867f7b30601506b0b8ccd2eccb5..4665043e9e72fbd539c85f69d09e24bed83c1051 100644
(file)
--- a/
libtest/test.h
+++ b/
libtest/test.h
@@
-7,6
+7,10
@@
#pragma once
#pragma once
+#ifndef __INTEL_COMPILER
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
/**
A structure describing the test case.
*/
/**
A structure describing the test case.
*/
@@
-16,16
+20,14
@@
struct test_st {
test_callback_fn *test_fn;
};
test_callback_fn *test_fn;
};
-#define TEST_STRINGIFY(x) #x
-#define TEST_TOSTRING(x) TEST_STRINGIFY(x)
-#define TEST_AT __FILE__ ":" TEST_TOSTRING(__LINE__)
-
+LIBTEST_API
+bool test_is_local(void);
#define test_assert_errno(A) \
do \
{ \
if ((A)) { \
#define test_assert_errno(A) \
do \
{ \
if ((A)) { \
- fprintf(stderr, "\n
Assertion failed at %s:%d: ", __FILE__, __LINE
__);\
+ fprintf(stderr, "\n
%s:%d: Assertion failed for %s: ", __FILE__, __LINE__, __func
__);\
perror(#A); \
fprintf(stderr, "\n"); \
create_core(); \
perror(#A); \
fprintf(stderr, "\n"); \
create_core(); \
@@
-37,7
+39,7
@@
do \
do \
{ \
if ((A)) { \
do \
{ \
if ((A)) { \
- fprintf(stderr, "\n
Assertion, %s(%s), failed at %s:%d: ", (B), #A, __FILE__, __LINE__
);\
+ fprintf(stderr, "\n
%s:%d: Assertion failed %s, with message %s, in %s", __FILE__, __LINE__, (B), #A, __func__
);\
fprintf(stderr, "\n"); \
create_core(); \
assert((A)); \
fprintf(stderr, "\n"); \
create_core(); \
assert((A)); \
@@
-48,7
+50,7
@@
do \
do \
{ \
if (! (A)) { \
do \
{ \
if (! (A)) { \
- fprintf(stderr, "\n
Assertion failed at %s:%d: %s\n", __FILE__, __LINE__, #A
);\
+ fprintf(stderr, "\n
%s:%d: Assertion \"%s\" failed, in %s\n", __FILE__, __LINE__, #A, __func__
);\
create_core(); \
return TEST_FAILURE; \
} \
create_core(); \
return TEST_FAILURE; \
} \
@@
-58,7
+60,7
@@
do \
do \
{ \
if (! (A)) { \
do \
{ \
if (! (A)) { \
- fprintf(stderr, "\n
Assertion failed at %s:%d: %s\n", __FILE__, __LINE__, #A
);\
+ fprintf(stderr, "\n
%s:%d: Assertion \"%s\" failed, in %s\n", __FILE__, __LINE__, #A, __func__
);\
create_core(); \
return TEST_FAILURE; \
} \
create_core(); \
return TEST_FAILURE; \
} \
@@
-68,7
+70,7
@@
do \
do \
{ \
if (! (A)) { \
do \
{ \
if (! (A)) { \
- fprintf(stderr, "\n
Assertion failed at %s:%d: \"%s\"
received \"%s\"\n", __FILE__, __LINE__, #A, (B));\
+ fprintf(stderr, "\n
%s:%d: Assertion \"%s\" failed,
received \"%s\"\n", __FILE__, __LINE__, #A, (B));\
create_core(); \
return TEST_FAILURE; \
} \
create_core(); \
return TEST_FAILURE; \
} \
@@
-87,7
+89,7
@@
do \
do \
{ \
if (1) { \
do \
{ \
if (1) { \
- fprintf(stderr, "\n
Failed at %s:%d: %s\n", __FILE__, __LINE__, #A
);\
+ fprintf(stderr, "\n
%s:%d: Failed with %s, in %s\n", __FILE__, __LINE__, #A, __func__
);\
create_core(); \
return TEST_FAILURE; \
} \
create_core(); \
return TEST_FAILURE; \
} \
@@
-98,7
+100,7
@@
do \
do \
{ \
if ((A)) { \
do \
{ \
if ((A)) { \
- fprintf(stderr, "\n
Assertion failed in %s:%d: %s\n", __FILE__, __LINE__, #A
);\
+ fprintf(stderr, "\n
%s:%d: Assertion failed %s, in %s\n", __FILE__, __LINE__, #A, __func__
);\
create_core(); \
return TEST_FAILURE; \
} \
create_core(); \
return TEST_FAILURE; \
} \
@@
-108,7
+110,7
@@
do \
do \
{ \
if ((A)) { \
do \
{ \
if ((A)) { \
- fprintf(stderr, "\n
Assertion failed at %s:%d:
%s with %s\n", __FILE__, __LINE__, #A, (B));\
+ fprintf(stderr, "\n
%s:%d: Assertion failed
%s with %s\n", __FILE__, __LINE__, #A, (B));\
create_core(); \
return TEST_FAILURE; \
} \
create_core(); \
return TEST_FAILURE; \
} \
@@
-160,3
+162,12
@@
do \
} \
} while (0)
} \
} while (0)
+#define test_return_if(__test_return_t) \
+do \
+{ \
+ if ((__test_return_t) != TEST_SUCCESS) \
+ { \
+ return __test_return_t; \
+ } \
+} while (0)
+