walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Preprocessor: fixed tests

This commit is contained in:
Daniel Marjamäki 2012-03-27 20:48:22 +02:00
parent b37cf11d20
commit 2ffb3baaed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/testpreprocessor.cpp
View File

@ -1601,7 +1601,7 @@ private:
#ifdef __GNUC__ #ifdef __GNUC__
ASSERT_EQUALS("\n\n$int a = 4; int b = 5;\n", actual[""]); ASSERT_EQUALS("\n\n$int a = 4; int b = 5;\n", actual[""]);
#else #else
ASSERT_EQUALS("\nint b = 5;\nint a = 4;\\\n", actual[""]); ASSERT_EQUALS("\nint b = 5;\n$int a = 4;\\\n", actual[""]);
#endif #endif
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
@ -3428,8 +3428,8 @@ private:
void macroChar() { void macroChar() {
const char filedata[] = "#define X 1\nX\n"; const char filedata[] = "#define X 1\nX\n";
ASSERT_EQUALS("\n$1\n", OurPreprocessor::expandMacros(filedata,NULL)); ASSERT_EQUALS("\n$1\n", OurPreprocessor::expandMacros(filedata,NULL));
OurPreprocessor::macroChar = '¤'; OurPreprocessor::macroChar = char(1);
ASSERT_EQUALS("\n¤1\n", OurPreprocessor::expandMacros(filedata,NULL)); ASSERT_EQUALS("\n" + std::string(char(1),1U) + "1\n", OurPreprocessor::expandMacros(filedata,NULL));
OurPreprocessor::macroChar = '$'; OurPreprocessor::macroChar = '$';
} }
}; };