[Mockpp-commits] mockpp/mockpp/examples Makefile.am,1.15,1.16 mock_greeter.cpp,1.19,1.20

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27352/mockpp/examples

Modified Files:
	Makefile.am mock_greeter.cpp 
Log Message:
integration cxxtest + ministl

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	19 Sep 2005 18:36:28 -0000	1.15
+++ Makefile.am	18 Dec 2005 16:56:23 -0000	1.16
@@ -3,6 +3,10 @@
 
 SUBDIRS= tutorial
 
+if BUILTIN_CXXTEST
+cxxtest_lib=$(top_builddir)/3party/cxxtest/cxxtest/libmockpp_cxxtest.la
+endif
+
 noinst_PROGRAMS  = mock_greeter
 
 all: $(bin_PROGRAMS)
@@ -10,6 +14,6 @@
 mock_greeter_SOURCES    = mock_greeter.cpp
 
 mock_greeter_LDADD = $(top_builddir)/mockpp/libmockpp.la  $(EA_EXTRA_LIB) $(LIBDL) $(LIBCPPUNIT) \
-	-lstdc++
+	-lstdc++ $(cxxtest_lib)
 
 mock_greeter_LDFLAGS = -L/opt/intel_cc_80/lib

Index: mock_greeter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/mock_greeter.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- mock_greeter.cpp	17 Dec 2005 18:38:47 -0000	1.19
+++ mock_greeter.cpp	18 Dec 2005 16:56:23 -0000	1.20
@@ -472,26 +472,10 @@
 
 int run_cppunit(int argc, char **argv)
 {
-  int ret = 1;
   CppUnit::TextUi::TestRunner runner;
   CppUnit::TestFactory &registry = CppUnit::TestFactoryRegistry::getRegistry();
-
   runner.addTest(registry.makeTest());
-
-  MyListener *listener = 0;
-  for (int i1 = 1; i1 < argc; ++i1)
-    if (strcmp (argv[1], "--show-name") == 0)
-      runner.eventManager().addListener(listener = new MyListener());
-
-#ifndef __BORLANDC__ // @todo
-  for (int i2 = 1; i2 < argc; ++i2)
-    if (strcmp (argv[i2], "--compiler-output") == 0)
-      runner.setOutputter( CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cerr ) );
-#endif
-
-  ret = runner.run() ? 0 : 1;
-  delete listener;
-  return ret;
+  return runner.run() ? 0 : 1;
 }
 
 #endif
@@ -506,10 +490,6 @@
 
 #elif defined(HAVE_CPPUNIT)
 
-  std::cout << "Options\n";
-  std::cout << "  --show-name        show method names before calling\n";
-  std::cout << "  --compiler-output  output similar to compilers\n";
-
   ret = run_cppunit(argc, argv);
 
   std::cout << "\n";