Remove BEGIN/END

[m6w6/libmemcached] / libtest / main.cc

diff --git a/libtest/main.cc b/libtest/main.cc
index 6bffa84cf86688a6be22fa55fcd47153375287f4..d6c4ecbfa59e82c25cbda5802905c291c0632826 100644 (file)
--- a/libtest/main.cc
+++ b/libtest/main.cc
@@ -292,7 +292,7 @@ int main(int argc, char *argv[])
           return EXIT_SKIP;
 
         case TEST_FAILURE:
-          std::cerr << "frame->create()" << std::endl;
+          std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "frame->create()" << std::endl;
           return EXIT_FAILURE;
         }
       }
@@ -340,32 +340,27 @@ int main(int argc, char *argv[])
   }
   catch (libtest::fatal& e)
   {
-    std::cerr << "FATAL:" << e.what() << std::endl;
-    exit_code= EXIT_FAILURE;
-  }
-  catch (libtest::start& e)
-  {
-    std::cerr << "Failure to start:" << e.what() << std::endl;
+    std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "FATAL:" << e.what() << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (libtest::disconnected& e)
   {
-    std::cerr << "Unhandled disconnection occurred:" << e.what() << std::endl;
+    std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "Unhandled disconnection occurred:" << e.what() << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (std::exception& e)
   {
-    std::cerr << "std::exception:" << e.what() << std::endl;
+    std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "std::exception:" << e.what() << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (char const*)
   {
-    std::cerr << "Exception:" << std::endl;
+    std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "Exception:" << std::endl;
     exit_code= EXIT_FAILURE;
   }
   catch (...)
   {
-    std::cerr << "Unknown exception halted execution." << std::endl;
+    std::cerr << __FILE__ << ":" <<  __LINE__ << ": " << "Unknown exception halted execution." << std::endl;
     exit_code= EXIT_FAILURE;
   }