diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-10-08 18:31:53 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-10-13 14:06:40 +0200 |
| commit | 9899d08c1c106e154e7c305b2dc239198b380f45 (patch) | |
| tree | cfbf3868b339069dde712d14621c3e0047930bfa /tests | |
| parent | 9808c3e42d8533b92d6af80c72325f894194e2da (diff) | |
fix quoting of dependencies with spaces
Always quote file name macro values that contain whitespace, because
every file name macro expansion produces a - guess what - file name.
Task-number: QTCREATORBUG-12296
Change-Id: I6a0ae25ed7a6f7fdbdfc5b81a3c5aea489ed2b37
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/makefiles/filenamemacros.mk | 7 | ||||
| -rw-r--r-- | tests/tests.cpp | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/tests/makefiles/filenamemacros.mk b/tests/makefiles/filenamemacros.mk index afe72a8..670e8de 100644 --- a/tests/makefiles/filenamemacros.mk +++ b/tests/makefiles/filenamemacros.mk @@ -15,11 +15,14 @@ Football: LolCatExtractorManager.tar.gz: @echo $* -manyDependents: Timmy Jimmy Kenny Eric Kyle Stan +dependencyWithSpaces: foo "broken arrow" bar + @echo $$** $** + +manyDependents: "Mr. Garrison" Timmy Jimmy Kenny Eric Kyle Stan @echo $** @echo $? -manyDependentsSingleExecution: Timmy Jimmy Kenny Eric Kyle Stan +manyDependentsSingleExecution: "Mr. Garrison" Timmy Jimmy Kenny Eric Kyle Stan !@echo $** !@echo $? diff --git a/tests/tests.cpp b/tests/tests.cpp index d6a8191..6b66852 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -669,16 +669,19 @@ void Tests::fileNameMacros() target->expandFileNameMacros(); QVERIFY(!target->m_commands.isEmpty()); command = target->m_commands.takeFirst(); - QCOMPARE(command.m_commandLine, QLatin1String("echo Timmy Jimmy Kenny Eric Kyle Stan")); + QCOMPARE(command.m_commandLine, + QLatin1String("echo \"Mr. Garrison\" Timmy Jimmy Kenny Eric Kyle Stan")); QVERIFY(!target->m_commands.isEmpty()); command = target->m_commands.takeFirst(); - QCOMPARE(command.m_commandLine, QLatin1String("echo Timmy Jimmy Kenny Eric Kyle Stan")); + QCOMPARE(command.m_commandLine, + QLatin1String("echo \"Mr. Garrison\" Timmy Jimmy Kenny Eric Kyle Stan")); target = mkfile->target(QLatin1String("manyDependentsSingleExecution")); QVERIFY(target); target->expandFileNameMacros(); - QCOMPARE(target->m_commands.size(), 12); - QStringList lst = QStringList() << "Timmy" << "Jimmy" << "Kenny" << "Eric" << "Kyle" << "Stan"; + QCOMPARE(target->m_commands.size(), 14); + QStringList lst = QStringList() << "\"Mr. Garrison\"" << "Timmy" << "Jimmy" << "Kenny" << "Eric" + << "Kyle" << "Stan"; lst.append(lst); foreach (const QString& str, lst) { QVERIFY(!target->m_commands.isEmpty()); |