feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CPlusPlus: Fix expectations in preprocessor autotest

Browse Source 
... regarding unfinished macro calls.
Amends df0ffd8bb8.

Change-Id: Ia7b8752860ac9207e702697cbee87f16a39dd1dd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-08-11 15:00:23 +02:00
parent e45ddaa40f
commit 0615d0ec06
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
View File

@@ -809,10 +809,7 @@ void tst_Preprocessor::unfinished_function_like_macro_call()
QByteArray expected__("# 1 \"<stdin>\"\n" QByteArray expected__("# 1 \"<stdin>\"\n"
"\n" "\n"
"\n" "\n"
"# expansion begin 24,3 3:4 ~1 3:7\n" "foo\n");
"1 + 2\n"
"# expansion end\n"
"# 4 \"<stdin>\"\n");
// DUMP_OUTPUT(preprocessed); // DUMP_OUTPUT(preprocessed);
QVERIFY(compare(preprocessed, expected__)); QVERIFY(compare(preprocessed, expected__));
@@ -1437,26 +1434,28 @@ void tst_Preprocessor::comments_within_data()
"void foo() {\n" "void foo() {\n"
" FOO(10,\n" " FOO(10,\n"
" //comment\n" " //comment\n"
" 12\n" " 12)\n"
"}\n" "}\n"
) << _( ) << _(
"# 1 \"<stdin>\"\n" "# 1 \"<stdin>\"\n"
"\n" "\n"
"\n" "\n"
"void foo() {\n" "void foo() {\n"
"# expansion begin 57,3 ~4 4:7 ~4 6:7 7:0 ~2\n" "# expansion begin 57,3 ~4 4:7 ~4 6:7 ~2\n"
"{ (void)10; (void)12}; }\n" "{ (void)10; (void)12; }\n"
"# expansion end\n" "# expansion end\n"
"# 8 \"<stdin>\"\n" "# 7 \"<stdin>\"\n"
"}\n"
) << _( ) << _(
"# 1 \"<stdin>\"\n" "# 1 \"<stdin>\"\n"
"\n" "\n"
"\n" "\n"
"void foo() {\n" "void foo() {\n"
"# expansion begin 57,3 ~4 4:7 ~5 6:7 7:0 ~2\n" "# expansion begin 57,3 ~4 4:7 ~5 6:7 ~2\n"
"{ (void)10; (void)/*comment*/ 12}; }\n" "{ (void)10; (void)/*comment*/ 12; }\n"
"# expansion end\n" "# expansion end\n"
"# 8 \"<stdin>\"\n" "# 7 \"<stdin>\"\n"
"}\n"
); );
QTest::newRow("case 6") << _( QTest::newRow("case 6") << _(
@@ -1465,26 +1464,28 @@ void tst_Preprocessor::comments_within_data()
"void foo() {\n" "void foo() {\n"
" FOO(10,\n" " FOO(10,\n"
" //tricky*/comment\n" " //tricky*/comment\n"
" 12\n" " 12)\n"
"}\n" "}\n"
) << _( ) << _(
"# 1 \"<stdin>\"\n" "# 1 \"<stdin>\"\n"
"\n" "\n"
"\n" "\n"
"void foo() {\n" "void foo() {\n"
"# expansion begin 57,3 ~4 4:7 ~4 6:7 7:0 ~2\n" "# expansion begin 57,3 ~4 4:7 ~4 6:7 ~2\n"
"{ (void)10; (void)12}; }\n" "{ (void)10; (void)12; }\n"
"# expansion end\n" "# expansion end\n"
"# 8 \"<stdin>\"\n" "# 7 \"<stdin>\"\n"
"}\n"
) << _( ) << _(
"# 1 \"<stdin>\"\n" "# 1 \"<stdin>\"\n"
"\n" "\n"
"\n" "\n"
"void foo() {\n" "void foo() {\n"
"# expansion begin 57,3 ~4 4:7 ~5 6:7 7:0 ~2\n" "# expansion begin 57,3 ~4 4:7 ~5 6:7 ~2\n"
"{ (void)10; (void)/*tricky*|comment*/ 12}; }\n" "{ (void)10; (void)/*tricky*|comment*/ 12; }\n"
"# expansion end\n" "# expansion end\n"
"# 8 \"<stdin>\"\n" "# 7 \"<stdin>\"\n"
"}\n"
); );
QTest::newRow("case 7") << _( QTest::newRow("case 7") << _(