projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge libtest.
[m6w6/libmemcached]
/
libtest
/
lite.h
diff --git
a/libtest/lite.h
b/libtest/lite.h
index 100b8e2044cc34856b986d68ce642fdf35d88d18..342be97d820bc85abcd244ba4a65cffeaee33987 100644
(file)
--- a/
libtest/lite.h
+++ b/
libtest/lite.h
@@
-51,7
+51,7
@@
# include <string.h>
#endif
# include <string.h>
#endif
-#if defined(
_
WIN32)
+#if defined(WIN32)
# include <malloc.h>
#else
# include <alloca.h>
# include <malloc.h>
#else
# include <alloca.h>
@@
-77,15
+77,7
@@
# define SKIP(__message_format, ...)
#endif
# define SKIP(__message_format, ...)
#endif
-static inline bool valgrind_is_caller(void)
-{
- if (getenv("TESTS_ENVIRONMENT") && strstr(getenv("TESTS_ENVIRONMENT"), "valgrind"))
- {
- return true;
- }
-
- return false;
-}
+#include <libtest/valgrind.h>
static inline size_t yatl_strlen(const char *s)
{
static inline size_t yatl_strlen(const char *s)
{
@@
-348,7
+340,7
@@
do \
} \
} while (0)
} \
} while (0)
-#define ASSERT_NEQ(__expected, __actual
, ...
) \
+#define ASSERT_NEQ(__expected, __actual) \
do \
{ \
if ((__expected) == (__actual)) { \
do \
{ \
if ((__expected) == (__actual)) { \