From 569e566b5e1a37b7fd172637cbfef2ff65d98538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Sun, 11 Dec 2011 13:47:45 +0000
Subject: [PATCH] middle of porting; unstable, don't checkout, added xml check
 output; refs #1

---
 src/stacktrace.cxx                        | 53 ++++++++++++-----------
 test/auto_test.cxx                        |  9 +++-
 test/configfile_test.cxx                  |  9 +++-
 test/dynamiclibrary_test.cxx              |  9 +++-
 test/exec_test.cxx                        |  9 +++-
 test/functiontrace_test.cxx               |  9 +++-
 test/mrwautofunctiontracelog4cxx_test.cxx |  9 +++-
 test/mrwexclog4cxx_test.cxx               | 10 +++--
 test/mrwexcstderr_test.cxx                |  9 +++-
 test/regexp_test.cxx                      |  9 +++-
 test/smartpointer_test.cxx                |  9 +++-
 test/stacktrace_test.cxx                  |  9 +++-
 test/stdext_test.cxx                      |  9 +++-
 test/string_test.cxx                      |  9 +++-
 test/tokenizer_test.cxx                   |  9 +++-
 15 files changed, 126 insertions(+), 54 deletions(-)

diff --git a/src/stacktrace.cxx b/src/stacktrace.cxx
index e7f9ec3..b4b4f61 100644
--- a/src/stacktrace.cxx
+++ b/src/stacktrace.cxx
@@ -88,22 +88,22 @@ namespace mrw {
 //----------------------------------------------------------------------------
 mrw::StackTrace::StackTrace() throw(std::bad_exception) {
   // maximum trace level is limited here to 50, see below why
-#   if defined(__GNUG__)
-  {
-#     define PUSH(i)                                                    \
-    (__builtin_frame_address(i)!=0 ?                                   \
-     (_trace.push_back(__builtin_return_address(i)), true) : false)
-    PUSH(0) && PUSH(1) && PUSH(2) && PUSH(3) && PUSH(4) && PUSH(5) &&
-      PUSH(6) && PUSH(7) && PUSH(8) && PUSH(9) && PUSH(10) && PUSH(11) &&
-      PUSH(12) && PUSH(13) && PUSH(14) && PUSH(15) && PUSH(16) && PUSH(17)
-      && PUSH(18) && PUSH(19) && PUSH(20) && PUSH(21) && PUSH(22) &&
-      PUSH(23) && PUSH(24) && PUSH(25) && PUSH(26) && PUSH(27) && PUSH(28)
-      && PUSH(29) && PUSH(30) && PUSH(31) && PUSH(32) && PUSH(33) &&
-      PUSH(34) && PUSH(35) && PUSH(36) && PUSH(37) && PUSH(38) && PUSH(39)
-      && PUSH(40) && PUSH(41) && PUSH(42) && PUSH(43) && PUSH(44) &&
-      PUSH(45) && PUSH(46) && PUSH(47) && PUSH(48) && PUSH(49);
-#     undef PUSH
-  }
+ #   if defined(__GNUG__)
+   {
+ #   define PUSH(i)                                                       \
+     (__builtin_frame_address(i)!=0 ?                                   \
+      (_trace.push_back(__builtin_return_address(i)), true) : false)
+     PUSH(0) && PUSH(1) && PUSH(2) && PUSH(3) && PUSH(4) && PUSH(5) &&
+       PUSH(6) && PUSH(7) && PUSH(8) && PUSH(9) && PUSH(10) && PUSH(11) &&
+       PUSH(12) && PUSH(13) && PUSH(14) && PUSH(15) && PUSH(16) && PUSH(17)
+       && PUSH(18) && PUSH(19) && PUSH(20) && PUSH(21) && PUSH(22) &&
+       PUSH(23) && PUSH(24) && PUSH(25) && PUSH(26) && PUSH(27) && PUSH(28)
+       && PUSH(29) && PUSH(30) && PUSH(31) && PUSH(32) && PUSH(33) &&
+       PUSH(34) && PUSH(35) && PUSH(36) && PUSH(37) && PUSH(38) && PUSH(39)
+       && PUSH(40) && PUSH(41) && PUSH(42) && PUSH(43) && PUSH(44) &&
+       PUSH(45) && PUSH(46) && PUSH(47) && PUSH(48) && PUSH(49);
+ #     undef PUSH
+   }
 #   elif defined(__GLIBC__)
   {
     const int TRACE_LEVEL(50);
@@ -332,15 +332,18 @@ mrw::StackTrace::BinFiles mrw::StackTrace::filename()
     std::string range, perm, x1, x2, size, lib;
     while (getline(is, s)) try {
       range = perm = x1 = x2 = size = lib = "????";
-      s>>range>>perm>>x1>>x2>>size>>lib;
-      range.resize(range.find_first_not_of("0123456789abcdefABCDEF"));
-      void* addr(0);
-      range>>addr;
-      // added check: no names in brackets: [lib], because there are
-      // [heap], [stack] and [vdso] that cannot be loaded
-      // question: should only files with ending '.so' be loaded?
-      if (lib.size() && lib[0]!='[' && lib[lib.size()-1]!=']' && addr>0)
-        res<<BinFiles::value_type(lib, addr);
+      s>>range>>perm>>x1>>x2>>size;
+      if (mrw::to<int>(size)>0) {
+        s>>lib;
+        range.resize(range.find_first_not_of("0123456789abcdefABCDEF"));
+        void* addr(0);
+        range>>addr;
+        // added check: no names in brackets: [lib], because there are
+        // [heap], [stack] and [vdso] that cannot be loaded
+        // question: should only files with ending '.so' be loaded?
+        if (lib.size() && lib[0]!='[' && lib[lib.size()-1]!=']' && addr>0)
+          res<<BinFiles::value_type(lib, addr);
+      }
     } catch (...) {} // ignore non matching lines
     return res;
   }
diff --git a/test/auto_test.cxx b/test/auto_test.cxx
index 8b3a559..cab304b 100644
--- a/test/auto_test.cxx
+++ b/test/auto_test.cxx
@@ -85,8 +85,13 @@ public:
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(AutoTest);
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/configfile_test.cxx b/test/configfile_test.cxx
index e311f32..a2ffb0b 100644
--- a/test/configfile_test.cxx
+++ b/test/configfile_test.cxx
@@ -65,8 +65,13 @@ public:
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(ConfigFileTest);
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/dynamiclibrary_test.cxx b/test/dynamiclibrary_test.cxx
index ce55be3..8a7fe14 100644
--- a/test/dynamiclibrary_test.cxx
+++ b/test/dynamiclibrary_test.cxx
@@ -40,8 +40,13 @@ class DynamicLibraryTest: public CppUnit::TestFixture {
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(DynamicLibraryTest);
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/exec_test.cxx b/test/exec_test.cxx
index fe73d03..becf63f 100644
--- a/test/exec_test.cxx
+++ b/test/exec_test.cxx
@@ -127,8 +127,13 @@ public:
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(ExecTest);
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/functiontrace_test.cxx b/test/functiontrace_test.cxx
index c4ec7d6..6ec31a4 100644
--- a/test/functiontrace_test.cxx
+++ b/test/functiontrace_test.cxx
@@ -126,8 +126,13 @@ class FunctionTraceTest: public CppUnit::TestFixture {
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(FunctionTraceTest);
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/mrwautofunctiontracelog4cxx_test.cxx b/test/mrwautofunctiontracelog4cxx_test.cxx
index 2664532..72b244d 100644
--- a/test/mrwautofunctiontracelog4cxx_test.cxx
+++ b/test/mrwautofunctiontracelog4cxx_test.cxx
@@ -237,8 +237,13 @@ namespace mrw {
   CPPUNIT_TEST_SUITE_REGISTRATION(AutoFunctionTraceLog4CxxTest);
 }
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/mrwexclog4cxx_test.cxx b/test/mrwexclog4cxx_test.cxx
index 91bcfa8..7d96565 100644
--- a/test/mrwexclog4cxx_test.cxx
+++ b/test/mrwexclog4cxx_test.cxx
@@ -85,9 +85,13 @@ namespace mrw {
   CPPUNIT_TEST_SUITE_REGISTRATION(AutoExcLog4CxxTest);
 }
 
-int main() {
-  log4cxx::BasicConfigurator::configure();
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/mrwexcstderr_test.cxx b/test/mrwexcstderr_test.cxx
index 250b830..bc7cea4 100644
--- a/test/mrwexcstderr_test.cxx
+++ b/test/mrwexcstderr_test.cxx
@@ -84,8 +84,13 @@ namespace mrw {
   CPPUNIT_TEST_SUITE_REGISTRATION(AutoExcStderrTest);
 }
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/regexp_test.cxx b/test/regexp_test.cxx
index 85634f9..b25d651 100644
--- a/test/regexp_test.cxx
+++ b/test/regexp_test.cxx
@@ -56,8 +56,13 @@ public:
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(RegExpTest);
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/smartpointer_test.cxx b/test/smartpointer_test.cxx
index 1e47598..118362a 100644
--- a/test/smartpointer_test.cxx
+++ b/test/smartpointer_test.cxx
@@ -155,8 +155,13 @@ public:
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(SmartPointerTest);
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/stacktrace_test.cxx b/test/stacktrace_test.cxx
index 533529d..13c8757 100644
--- a/test/stacktrace_test.cxx
+++ b/test/stacktrace_test.cxx
@@ -76,8 +76,13 @@ namespace mrw {
   CPPUNIT_TEST_SUITE_REGISTRATION(StackTraceTest);
 }
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/stdext_test.cxx b/test/stdext_test.cxx
index a744803..76a2a99 100644
--- a/test/stdext_test.cxx
+++ b/test/stdext_test.cxx
@@ -259,8 +259,13 @@ public:
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(StdExtTest);
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/string_test.cxx b/test/string_test.cxx
index ea49474..7d6baaa 100644
--- a/test/string_test.cxx
+++ b/test/string_test.cxx
@@ -42,8 +42,13 @@ class StringTest: public CppUnit::TestFixture {
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(StringTest);
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
diff --git a/test/tokenizer_test.cxx b/test/tokenizer_test.cxx
index b06a14a..d97bdaf 100644
--- a/test/tokenizer_test.cxx
+++ b/test/tokenizer_test.cxx
@@ -67,8 +67,13 @@ public:
 };
 CPPUNIT_TEST_SUITE_REGISTRATION(TokenizerTest);
 
-int main() {
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
   CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
   runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
   return runner.run() ? 0 : 1;
-}
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }