[Mockpp-commits] mockpp/mockpp/tests mock_test.cpp,1.40,1.41 mock_test_win32.cpp,1.1,1.2

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

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

Modified Files:
	mock_test.cpp mock_test_win32.cpp 
Log Message:
workarounds bcb5

Index: mock_test_win32.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test_win32.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mock_test_win32.cpp	11 Dec 2005 20:05:03 -0000	1.1
+++ mock_test_win32.cpp	4 Jan 2006 19:56:22 -0000	1.2
@@ -1,2 +1,20 @@
 #define GUI_WIN32
 #include "mock_test.cpp"
+
+/* Borland BCB5 Settings
+
+  <OPTIONS>
+    <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC -tWM -c"/>
+    <PFLAGS value="-N2&quot;c:\tmp\compile\mockpp_34\&quot; -N0&quot;c:\tmp\compile\mockpp_34\&quot; -$YD -$W
+      -$O- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zd"/>
+    <LFLAGS value="-l&quot;c:\tmp\compile\&quot; -I&quot;c:\tmp\compile\mockpp_34\&quot; -D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib"/>
+  </LINKER>
+
+*/

Index: mock_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- mock_test.cpp	2 Jan 2006 20:27:57 -0000	1.40
+++ mock_test.cpp	4 Jan 2006 19:56:22 -0000	1.41
@@ -116,11 +116,6 @@
 
 int run_cxxtest(int argc, char **argv)
 {
-  bool show = false;
-  for (int i1 = 1; i1 < argc; ++i1)
-    if (strcmp (argv[1], "--show-name") == 0)
-      show = true;
-
 #if defined(GUI_QT)
   return CxxTest::GuiTuiRunner<CxxTest::QtGui, CxxTest::StdioPrinter>( argc, argv ).run();
 #elif defined(GUI_X11)
@@ -128,10 +123,15 @@
 #elif defined(GUI_WIN32)
   return CxxTest::GuiTuiRunner<CxxTest::Win32Gui, CxxTest::StdioPrinter>( argc, argv ).run();
 #else
-   MyErrorPrinter ep(show);
-   mockpp::CxxTestRunner::runAllTests(ep);
-   return CxxTest::tracker().failedTests();
-   //return CxxTest::ErrorPrinter().run();
+  bool show = false;
+  for (int i1 = 1; i1 < argc; ++i1)
+    if (strcmp (argv[1], "--show-name") == 0)
+      show = true;
+
+  MyErrorPrinter ep(show);
+  mockpp::CxxTestRunner::runAllTests(ep);
+  return CxxTest::tracker().failedTests();
+  //return CxxTest::ErrorPrinter().run();
 #endif
 }