Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/mockpp/tests
Modified Files:
mock_test.cpp
Log Message:
cleanup namespace disabling
Index: mock_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- mock_test.cpp 19 Mar 2006 11:09:37 -0000 1.43
+++ mock_test.cpp 19 Mar 2006 16:26:50 -0000 1.44
@@ -91,6 +91,35 @@
#endif
+/////////////////////////////////////////////////////
+
+
+#ifndef MOCKPP_NS
+# define MOCKPP_NS n/a
+#endif
+
+#ifndef MINISTL_NS
+# define MINISTL_NS n/a
+#endif
+
+#ifndef CXXTEST_NS
+# define CXXTEST_NS n/a
+#endif
+
+#define STRINGIZE(text) STRINGIZE_I(text)
+#define STRINGIZE_I(text) #text
+
+#define PRINT_NS \
+ std::cout << " - namespace mockpp : " << STRINGIZE(MOCKPP_NS) << std::endl \
+ << " - namespace stl : " << STRINGIZE(MOCKPP_STL) << std::endl \
+ << " - namespace std : " << STRINGIZE(MOCKPP_STD_NS) << std::endl \
+ << " - namespace ministl: " << STRINGIZE(MINISTL_NS) << std::endl \
+ << " - namespace CxxTest: " << STRINGIZE(CXXTEST_NS) << std::endl
+
+
+/////////////////////////////////////////////////////
+
+
#if defined(MOCKPP_USE_CXXTEST)
class MyErrorPrinter : public CXXTEST_NS::ErrorPrinter
@@ -114,6 +143,7 @@
bool show;
};
+
int run_cxxtest(int argc, char **argv)
{
#if defined(GUI_QT)
@@ -224,6 +254,8 @@
std::cout << " - support pti-weakness disabled\n";
#endif
+ PRINT_NS;
+
std::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl;
std::cout << "\n";
/*
@@ -264,6 +296,8 @@
std::cout << " - using cppunit framework\n";
#endif
+ PRINT_NS;
+
#ifdef MOCKPP_PTI_WEAKNESS
std::cout << " - support pti-weakness enabled\n";
#else
|