Merge in libtest updates.

[awesomized/libmemcached] / libtest / cmdline.cc

diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
index 2b67a47dfc5695b8590cf9e2286d2aa66713c8c0..afd560b255263da3a6320075db5dccff8358d122 100644 (file)
--- a/libtest/cmdline.cc
+++ b/libtest/cmdline.cc
@@ -38,6 +38,8 @@
 
 #include <libtest/cmdline.h>
 
+using namespace libtest;
+
 #include <cstdlib>
 #include <string>
 #include <sstream>
@@ -48,13 +50,27 @@ bool exec_cmdline(const std::string& executable, const char *args[])
 
   arg_buffer << "./libtool --mode=execute ";
 
+  if (getenv("LIBTEST_TEST_ENVIRONMENT"))
+  {
+    arg_buffer << getenv("LIBTEST_TEST_ENVIRONMENT");
+    arg_buffer << " ";
+  }
+
   arg_buffer << executable;
   for (const char **ptr= args; *ptr; ++ptr)
   {
     arg_buffer << " " << *ptr;
   }
 
-  arg_buffer << " > /dev/null 2>&1";
+  if (getenv("LIBTEST_TEST_ENVIRONMENT"))
+  {
+    std::cerr << std::endl << arg_buffer.str() << std::endl;
+  }
+  else
+  {
+    arg_buffer << " > /dev/null 2>&1";
+  }
+
   if (system(arg_buffer.str().c_str()) == -1)
   {
     return false;