diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-01-02 19:10:13 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-01-02 19:28:12 +0100 |
| commit | 44d2d1551cf78b854452f0e2d89c0fb53299079c (patch) | |
| tree | 8212d6ba468252913d2be822912d4f0d585b3f3b /tests | |
| parent | 39c04c9b9b5ed5b23d8410d22296c67be54dbef0 (diff) | |
fix filename macro modifiers for $** and $?
The filename macros $** and $? return lists of values.
All of those values must be modified, if a filename modifier is given.
getFileNameMacroValue was renamed to getFileNameMacroValues and returns
a QStringList.
Task-number: QTCREATORBUG-6932
Change-Id: I44108ff45db29e8691bd30315ba8f9a6d5c49f36
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tests.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/tests.cpp b/tests/tests.cpp index 220e825..d1414bd 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -708,34 +708,26 @@ void ParserTest::fileNameMacros() target->expandFileNameMacros(); QVERIFY(!target->m_commands.isEmpty()); command = target->m_commands.takeFirst(); - QEXPECT_FAIL("", "Needs to be fixed. See QTCREATORBUG-6932.", Continue); QCOMPARE(command.m_commandLine, QLatin1String("echo $(**D) subdir subdir\\subsubdir . . . .")); QVERIFY(!target->m_commands.isEmpty()); command = target->m_commands.takeFirst(); - QEXPECT_FAIL("", "Needs to be fixed. See QTCREATORBUG-6932.", Continue); QCOMPARE(command.m_commandLine, QLatin1String("echo $(**B) Timmy Jimmy Kenny Eric Kyle Stan")); QVERIFY(!target->m_commands.isEmpty()); command = target->m_commands.takeFirst(); - QEXPECT_FAIL("", "Needs to be fixed. See QTCREATORBUG-6932.", Continue); QCOMPARE(command.m_commandLine, QLatin1String("echo $(**F) Timmy.txt Jimmy.txt Kenny.txt Eric.txt Kyle.txt Stan.txt")); QVERIFY(!target->m_commands.isEmpty()); command = target->m_commands.takeFirst(); - QEXPECT_FAIL("", "Needs to be fixed. See QTCREATORBUG-6932.", Continue); QCOMPARE(command.m_commandLine, QLatin1String("echo $(**R) subdir\\Timmy subdir\\subsubdir\\Jimmy Kenny Eric Kyle Stan")); command = target->m_commands.takeFirst(); - QEXPECT_FAIL("", "Needs to be fixed. See QTCREATORBUG-6932.", Continue); QCOMPARE(command.m_commandLine, QLatin1String("echo $(?D) subdir subdir\\subsubdir . . . .")); QVERIFY(!target->m_commands.isEmpty()); command = target->m_commands.takeFirst(); - QEXPECT_FAIL("", "Needs to be fixed. See QTCREATORBUG-6932.", Continue); QCOMPARE(command.m_commandLine, QLatin1String("echo $(?B) Timmy Jimmy Kenny Eric Kyle Stan")); QVERIFY(!target->m_commands.isEmpty()); command = target->m_commands.takeFirst(); - QEXPECT_FAIL("", "Needs to be fixed. See QTCREATORBUG-6932.", Continue); QCOMPARE(command.m_commandLine, QLatin1String("echo $(?F) Timmy.txt Jimmy.txt Kenny.txt Eric.txt Kyle.txt Stan.txt")); QVERIFY(!target->m_commands.isEmpty()); command = target->m_commands.takeFirst(); - QEXPECT_FAIL("", "Needs to be fixed. See QTCREATORBUG-6932.", Continue); QCOMPARE(command.m_commandLine, QLatin1String("echo $(?R) subdir\\Timmy subdir\\subsubdir\\Jimmy Kenny Eric Kyle Stan")); system("del generated.txt gen1.txt gen2.txt gen3.txt > NUL 2>&1"); |