libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

fixed a lot of issues, now successfully runs the test with --enable-pedantic; refs #8

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-03-28 11:50:39 +00:00
parent e846c326f1
commit 190b469d56
33 changed files with 398 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/functiontrace_test.cxx
View File

@@ -70,7 +70,7 @@ void fn(A a) {
class FunctionTraceTest: public CppUnit::TestFixture {
public:
void Init() {
try {mrw::File::remove("functiontrace_test.log");} catch (...) {}
try {mrw::File::remove("functiontrace_test.trace");} catch (...) {}
log4cxx::helpers::Properties properties;
std::string name, cont;
properties.setProperty((name="log4j.rootLogger",
@@ -91,7 +91,7 @@ class FunctionTraceTest: public CppUnit::TestFixture {
std::string(cont.begin(), cont.end())));
properties.setProperty((name="log4j.appender.A1.filename",
std::string(name.begin(), name.end())),
(cont="functiontrace_test.log",
(cont="functiontrace_test.trace",
std::string(cont.begin(), cont.end())));
log4cxx::PropertyConfigurator::configure(properties);
}
@@ -118,8 +118,8 @@ class FunctionTraceTest: public CppUnit::TestFixture {
".*functiontrace_test.cxx:[0-9]+ - / fn\\(A\\)\n"
".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: \\\\ A::~A\\(\\)\n"
".*functiontrace_test.cxx:[0-9]+ - *0x[0-9a-fA-F]+: / A::~A\\(\\)\n");
CPPUNIT_ASSERT(match(mrw::File::read("functiontrace_test.log")));
mrw::File::remove("functiontrace_test.log");
CPPUNIT_ASSERT(match(mrw::File::read("functiontrace_test.trace")));
mrw::File::remove("functiontrace_test.trace");
}
CPPUNIT_TEST_SUITE(FunctionTraceTest);
CPPUNIT_TEST(Init);