projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests: speedup by not waiting too long for servers
[awesomized/libmemcached]
/
libtest
/
comparison.cc
diff --git
a/libtest/comparison.cc
b/libtest/comparison.cc
index c16399db7a31f3e9a5d0a1d5363cb3a1180fe49f..c0c21937f9512b08dc127916cf14bb0ae1a89e5f 100644
(file)
--- a/
libtest/comparison.cc
+++ b/
libtest/comparison.cc
@@
-34,7
+34,7
@@
*
*/
*
*/
-#include "
mem_config
.h"
+#include "
libtest/yatlcon
.h"
#include <libtest/common.h>
namespace libtest {
#include <libtest/common.h>
namespace libtest {
@@
-49,19
+49,14
@@
bool jenkins_is_caller(void)
return false;
}
return false;
}
-bool
valgrind
_is_caller(void)
+bool
gdb
_is_caller(void)
{
{
- if (bool(getenv("
TESTS_ENVIRONMENT")) and strstr(getenv("TESTS_ENVIRONMENT"), "valgrind
"))
+ if (bool(getenv("
LOG_COMPILER")) and strstr(getenv("LOG_COMPILER"), "gdb
"))
{
return true;
}
{
return true;
}
- return false;
-}
-
-bool gdb_is_caller(void)
-{
- if (bool(getenv("TESTS_ENVIRONMENT")) and strstr(getenv("TESTS_ENVIRONMENT"), "gdb"))
+ if (bool(getenv("LIBTEST_IN_GDB")))
{
return true;
}
{
return true;
}
@@
-71,7
+66,7
@@
bool gdb_is_caller(void)
bool helgrind_is_caller(void)
{
bool helgrind_is_caller(void)
{
- if (bool(getenv("
TESTS_ENVIRONMENT")) and strstr(getenv("TESTS_ENVIRONMENT
"), "helgrind"))
+ if (bool(getenv("
LOG_COMPILER")) and strstr(getenv("LOG_COMPILER
"), "helgrind"))
{
return true;
}
{
return true;
}