diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-04 15:53:24 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-04 16:51:33 +0100 |
| commit | d7c7eb3c3266fefc128dc03d5674cb57549c545e (patch) | |
| tree | 73382d68b424e2b520a66813a32029013a8d1e42 | |
| parent | 934b919375778353ab4ced23042a99fb7dcc0fa5 (diff) | |
| download | qbs-d7c7eb3c3266fefc128dc03d5674cb57549c545e.tar.gz | |
Fix autotest.
The "raw backslash" case does not add anything of use, and most likely
produces invalid C++.
Change-Id: I6d86d2e3a9a4cb3ff7682c5e97475c3e7d5a1c6b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | tests/auto/blackbox/testdata/proper quoting/main.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs | 4 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/tests/auto/blackbox/testdata/proper quoting/main.cpp b/tests/auto/blackbox/testdata/proper quoting/main.cpp index 26e0cdc49..edc62cfcf 100644 --- a/tests/auto/blackbox/testdata/proper quoting/main.cpp +++ b/tests/auto/blackbox/testdata/proper quoting/main.cpp @@ -29,9 +29,6 @@ #include <stdio.h> -#define __stringify__(x) #x -#define stringify(x) __stringify__(x) - int bla(); int main() @@ -40,8 +37,6 @@ int main() printf(DEFINEWITHSPACE"\n"); printf(DEFINEWITHTAB"\n"); printf(DEFINEWITHBACKSLASH"\n"); - printf(stringify(DEFINEWITHBACKSLASHRAW)"\n"); return bla(); } - diff --git a/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs b/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs index 64a35b46b..c1db3c1b2 100644 --- a/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs +++ b/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs @@ -12,9 +12,7 @@ Project { 'DEFINEWITHSPACE="contains space"', 'DEFINEWITHTAB="contains\ttab"', 'DEFINEWITHBACKSLASH="backslash\\\\"', - 'DEFINEWITHBACKSLASHRAW=backslash\\\\' ] -// cpp.responseFileThreshold: 0 } Product { @@ -23,7 +21,6 @@ Project { files : [ "my static lib.cpp" ] Depends { name: "cpp" } Depends { name: "helper lib" } -// cpp.responseFileThreshold: 0 } Product { @@ -38,6 +35,5 @@ Project { Depends { name: "cpp" } cpp.includePaths: ['some helper'] } -// cpp.responseFileThreshold: 0 } } diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 68f57166f..116da31fa 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -1377,7 +1377,7 @@ void TestBlackbox::properQuoting() params.expectFailure = true; // Because the exit code is non-zero. QCOMPARE(runQbs(params), 156); const char * const expectedOutput = "whitespaceless\ncontains space\ncontains\ttab\n" - "backslash\\\nbackslash\\\nHello World! The magic number is 156."; + "backslash\\\nHello World! The magic number is 156."; QCOMPARE(unifiedLineEndings(m_qbsStdout).constData(), expectedOutput); } |