From b0ef8cb4b2a4056fc7df7c16aa6a170edb4dea34 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Wed, 6 Jul 2011 19:38:41 -0700
Subject: [PATCH] Possible fix for Ubuntu

---
 libtest/memcached.cc |  5 +++--
 libtest/stream.h     | 35 +++++++++++++++++++++--------------
 libtest/test.cc      |  5 ++---
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index c3f40fa8..2b49c608 100644
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -111,7 +111,8 @@ static bool cycle_server(server_st  *server)
 
 bool server_startup(server_startup_st *construct)
 {
-  Log;
+  Logn();
+
   if (getenv(((char *)"MEMCACHED_SERVERS")))
   {
     construct->server_list= getenv(((char *)"MEMCACHED_SERVERS"));
@@ -246,7 +247,7 @@ bool server_startup(server_startup_st *construct)
     construct->server_list= server_config_string;
   }
 
-  Log;
+  Logn();
 
   srandom((unsigned int)time(NULL));
 
diff --git a/libtest/stream.h b/libtest/stream.h
index 3ad71b1f..558b2790 100644
--- a/libtest/stream.h
+++ b/libtest/stream.h
@@ -97,14 +97,15 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
     int _line_number;
 
   public:
-    log(const char *filename, int line_number) :
-      _filename(filename),
-      _line_number(line_number)
+    log() :
+      _filename(NULL),
+      _line_number(0)
+    { }
+
+    void set_filename(const char *filename, int line_number)
     {
-      if (_filename)
-      {
-        arg << _filename << ":" << _line_number << " ";
-      }
+      _filename= filename;
+      _line_number= line_number;
     }
 
     ~log()
@@ -116,6 +117,11 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
     template<class T>
       log &operator<<(const T &x)
       {
+        if (_filename)
+        {
+          arg << __FILE__ << ":" << __LINE__ << " ";
+          _filename= NULL;
+        }
         arg << x;
         return *this;
       }
@@ -127,22 +133,21 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
 
 class cerr : public detail::log<detail::cerr> {
 public:
-  cerr(const char *filename, int line_number) :
-    log(filename, line_number)
-  { }
+  cerr(const char *filename, int line_number)
+  {
+    set_filename(filename, line_number);
+  }
 };
 
 class clog : public detail::log<detail::clog> {
 public:
-  clog(const char *filename, int line_number) :
-    log(filename, line_number)
+  clog(const char *, int)
   { }
 };
 
 class cout : public detail::log<detail::cout> {
 public:
-  cout(const char *filename, int line_number) :
-    log(filename, line_number)
+  cout(const char *, int)
   { }
 };
 
@@ -155,4 +160,6 @@ public:
 
 #define Log stream::clog(NULL, __LINE__)
 
+#define Logn() stream::clog(NULL, __LINE__) << " "
+
 } // namespace libtest
diff --git a/libtest/test.cc b/libtest/test.cc
index 33353bd5..8beef356 100644
--- a/libtest/test.cc
+++ b/libtest/test.cc
@@ -390,6 +390,8 @@ int main(int argc, char *argv[])
         Error << "Failed while running on_error()";
         break;
       }
+
+      Logn();
     }
 
     if (next->post and world->runner->post)
@@ -427,13 +429,10 @@ cleanup:
 
   stats_print(&stats);
 
-  Error << " ";
   void *retval;
   pthread_join(thread, &retval);
 
-  Error << " word";
   delete world;
-  Error << " after word";
 
   return stats.failed == 0 and __shutdown == SHUTDOWN_GRACEFUL ? EXIT_SUCCESS : EXIT_FAILURE;
 }
-- 
2.30.2