Merge

[m6w6/libmemcached] / libtest / test.cc

diff --git a/libtest/test.cc b/libtest/test.cc
index b7f584421276443b9f8b9a2d206b029ffb6df232..80cb8ddd64f30fee70ad949c335ebba24e1ae7bc 100644 (file)
--- a/libtest/test.cc
+++ b/libtest/test.cc
@@ -139,7 +139,6 @@ int main(int argc, char *argv[])
   case TEST_FATAL:
   case TEST_FAILURE:
   case TEST_MEMORY_ALLOCATION_FAILURE:
-    Error << argv[0] << " failed in Framework::create()";
     delete world;
     return EXIT_FAILURE;
   }
@@ -151,7 +150,10 @@ int main(int argc, char *argv[])
   }
   else if (getenv("TEST_COLLECTION"))
   {
-    collection_to_run= getenv("TEST_COLLECTION");
+    if (strlen(getenv("TEST_COLLECTION")))
+    {
+      collection_to_run= getenv("TEST_COLLECTION");
+    }
   }
 
   if (collection_to_run)