diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-12-03 13:04:58 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-12-06 11:39:16 +0000 |
| commit | a78974f95b1e4851728b8f6a47715022f11f9059 (patch) | |
| tree | 102bfe4ad7bddff99e2a343536f84b7080a68771 /tests | |
| parent | 645785b5eddd1b90cea447d6a2eb7a53c255a820 (diff) | |
Fix line continuations for preprocessor directives
Line continuations in preprocessor directives are now handled correctly
such that assignments like the following are possible:
VAR=foo\
!IF 1
bar\
!EL\
SE
baz\
!ENDIF
zap
which evaluates to
VAR=foo bar zap
Task-number: QTCREATORBUG-8621
Task-number: QTCREATORBUG-18001
Change-Id: I3f86c6e3b13cbc04451fcfb267c5c43946b8e85c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tests.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/tests.cpp b/tests/tests.cpp index 668baeb..0d8ee79 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -313,7 +313,6 @@ void Tests::preprocessorInvalidExpressions() void Tests::conditionals() { - QEXPECT_FAIL("", "QTCREATORBUG-8621", Continue); QVERIFY( openMakefile(QLatin1String("conditionals.mk")) ); QScopedPointer<Makefile> mkfile(m_makefileFactory->makefile()); QVERIFY(mkfile); @@ -328,9 +327,7 @@ void Tests::conditionals() QCOMPARE(macroTable->macroValue("TEST6"), QLatin1String("true")); QCOMPARE(macroTable->macroValue("TEST7"), QLatin1String("true")); QCOMPARE(macroTable->macroValue("TEST8"), QLatin1String("true")); - QEXPECT_FAIL("", "QTCREATORBUG-8621", Continue); QCOMPARE(macroTable->macroValue("TEST9"), QLatin1String("foo bar baz")); - QEXPECT_FAIL("", "QTCREATORBUG-8621", Continue); QCOMPARE(macroTable->macroValue("TEST10"), QLatin1String("foo bar boo hoo")); } |