X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcomparison.cc;h=9b3e45e58907be57935a462b8c2aeed048b12e57;hb=20ac79fc8f8999f39b4fb33e55d4a205ce0c9a10;hp=c16399db7a31f3e9a5d0a1d5363cb3a1180fe49f;hpb=ad5cb8f903869065c72bb18bf98af6909189a5a9;p=awesomized%2Flibmemcached

diff --git a/libtest/comparison.cc b/libtest/comparison.cc
index c16399db..9b3e45e5 100644
--- 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 {
@@ -49,19 +49,14 @@ bool jenkins_is_caller(void)
   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("TESTS_ENVIRONMENT")) and strstr(getenv("TESTS_ENVIRONMENT"), "gdb"))
   {
     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;
   }