projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Small icc repairs.
[m6w6/libmemcached]
/
tests
/
test.h
diff --git
a/tests/test.h
b/tests/test.h
index 39b141250ad7d76fc10caa9c190caff9a611cd37..972788e5cb92f5c0fb37d03b17ae3f6fbb12386b 100644
(file)
--- a/
tests/test.h
+++ b/
tests/test.h
@@
-16,9
+16,12
@@
extern "C" {
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <stdbool.h>
#include <stdint.h>
#include <stdint.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
+
typedef struct world_st world_st;
typedef struct collection_st collection_st;
typedef struct test_st test_st;
typedef struct world_st world_st;
typedef struct collection_st collection_st;
typedef struct test_st test_st;
@@
-102,11
+105,13
@@
struct world_st {
test_callback_error_fn on_error;
} test;
test_callback_error_fn on_error;
} test;
- /* This is called a the beginning of any collection run. */
- test_callback_fn collection_startup;
+ struct {
+ /* This is called a the beginning of any collection run. */
+ test_callback_fn startup;
- /* This is called a the beginning of any collection run. */
- test_callback_fn collection_shutdown;
+ /* This is called at the end of any collection run. */
+ test_callback_fn shutdown;
+ } collection;
/**
/**
@@
-142,6
+147,14
@@
void create_core(void);
*/
const char *test_strerror(test_return_t code);
*/
const char *test_strerror(test_return_t code);
+#define test_fail(A) \
+do \
+{ \
+ fprintf(stderr, "\nFailed in %s:%d: %s\n", __FILE__, __LINE__, #A);\
+ create_core(); \
+ return TEST_FAILURE; \
+} while (0)
+
#define test_truth(A) \
do \
{ \
#define test_truth(A) \
do \
{ \