Merge in trunk

[m6w6/libmemcached] / libtest / cmdline.cc

diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
index b48d69172ee949d4bc221867532958be6d38c1fa..4dc84c9d66990d547f48f40180530c2977b259be 100644 (file)
--- a/libtest/cmdline.cc
+++ b/libtest/cmdline.cc
@@ -33,12 +33,12 @@ bool exec_cmdline(const std::string& executable, const char *args[])
 {
   std::stringstream arg_buffer;
 
-  arg_buffer << "./libtool --mode=execute ";
+  arg_buffer << libtool();
 
-  if (getenv("LIBTEST_TEST_ENVIRONMENT"))
+  if (getenv("PWD"))
   {
-    arg_buffer << getenv("LIBTEST_TEST_ENVIRONMENT");
-    arg_buffer << " ";
+    arg_buffer << getenv("PWD");
+    arg_buffer << "/";
   }
 
   arg_buffer << executable;
@@ -47,14 +47,9 @@ bool exec_cmdline(const std::string& executable, const char *args[])
     arg_buffer << " " << *ptr;
   }
 
-  if (getenv("LIBTEST_TEST_ENVIRONMENT"))
-  {
-    std::cerr << std::endl << arg_buffer.str() << std::endl;
-  }
-  else
-  {
+#if 0
     arg_buffer << " > /dev/null 2>&1";
-  }
+#endif
 
   if (system(arg_buffer.str().c_str()) == -1)
   {
@@ -64,4 +59,9 @@ bool exec_cmdline(const std::string& executable, const char *args[])
   return true;
 }
 
+const char *gearmand_binary() 
+{
+  return GEARMAND_BINARY;
+}
+
 } // namespace exec_cmdline