diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-08-13 11:41:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-08-13 11:41:32 +0200 |
| commit | f296ed1328b9d12851b0474c6121fbbfba1f9b97 (patch) | |
| tree | 23b05a9741b219a3ca4c1b2a3c3f45b4be34d82b /tests | |
| parent | 96474eecc7ac3cdab7f1f3772de8181f1702bc39 (diff) | |
| parent | 3e1d204c32fa735e599840afe166517fa0f90839 (diff) | |
Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I1c426d95eedd82bd4470a64a9bafd734d23081ac
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp index 6801240368d..b2b8e428e45 100644 --- a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp +++ b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp @@ -809,10 +809,7 @@ void tst_Preprocessor::unfinished_function_like_macro_call() QByteArray expected__("# 1 \"<stdin>\"\n" "\n" "\n" - "# expansion begin 24,3 3:4 ~1 3:7\n" - "1 + 2\n" - "# expansion end\n" - "# 4 \"<stdin>\"\n"); + "foo\n"); // DUMP_OUTPUT(preprocessed); QVERIFY(compare(preprocessed, expected__)); @@ -1437,26 +1434,28 @@ void tst_Preprocessor::comments_within_data() "void foo() {\n" " FOO(10,\n" " //comment\n" - " 12\n" + " 12)\n" "}\n" ) << _( "# 1 \"<stdin>\"\n" "\n" "\n" "void foo() {\n" - "# expansion begin 57,3 ~4 4:7 ~4 6:7 7:0 ~2\n" - "{ (void)10; (void)12}; }\n" + "# expansion begin 57,3 ~4 4:7 ~4 6:7 ~2\n" + "{ (void)10; (void)12; }\n" "# expansion end\n" - "# 8 \"<stdin>\"\n" + "# 7 \"<stdin>\"\n" + "}\n" ) << _( "# 1 \"<stdin>\"\n" "\n" "\n" "void foo() {\n" - "# expansion begin 57,3 ~4 4:7 ~5 6:7 7:0 ~2\n" - "{ (void)10; (void)/*comment*/ 12}; }\n" + "# expansion begin 57,3 ~4 4:7 ~5 6:7 ~2\n" + "{ (void)10; (void)/*comment*/ 12; }\n" "# expansion end\n" - "# 8 \"<stdin>\"\n" + "# 7 \"<stdin>\"\n" + "}\n" ); QTest::newRow("case 6") << _( @@ -1465,26 +1464,28 @@ void tst_Preprocessor::comments_within_data() "void foo() {\n" " FOO(10,\n" " //tricky*/comment\n" - " 12\n" + " 12)\n" "}\n" ) << _( "# 1 \"<stdin>\"\n" "\n" "\n" "void foo() {\n" - "# expansion begin 57,3 ~4 4:7 ~4 6:7 7:0 ~2\n" - "{ (void)10; (void)12}; }\n" + "# expansion begin 57,3 ~4 4:7 ~4 6:7 ~2\n" + "{ (void)10; (void)12; }\n" "# expansion end\n" - "# 8 \"<stdin>\"\n" + "# 7 \"<stdin>\"\n" + "}\n" ) << _( "# 1 \"<stdin>\"\n" "\n" "\n" "void foo() {\n" - "# expansion begin 57,3 ~4 4:7 ~5 6:7 7:0 ~2\n" - "{ (void)10; (void)/*tricky*|comment*/ 12}; }\n" + "# expansion begin 57,3 ~4 4:7 ~5 6:7 ~2\n" + "{ (void)10; (void)/*tricky*|comment*/ 12; }\n" "# expansion end\n" - "# 8 \"<stdin>\"\n" + "# 7 \"<stdin>\"\n" + "}\n" ); QTest::newRow("case 7") << _( |