feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix expander test

Browse Source 
expandProcessArgs now returns an error if an invalid
sequence is given.

Change-Id: I6e7398bbd4101d4b3faae11d5c4f2d23fb71f000
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Marcus Tillmanns
2024-10-23 08:43:54 +02:00
parent f6c1a103d6
commit dd6cf04e6f
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/auto/utils/expander/tst_expander.cpp
View File

@@ -212,10 +212,6 @@ private slots:
<< QString("sh -c 'echo %{WithSpace}'") << QString("sh -c 'echo This has spaces'") << QString("sh -c 'echo %{WithSpace}'") << QString("sh -c 'echo This has spaces'")
<< Utils::OsTypeLinux << withspace; << Utils::OsTypeLinux << withspace;
// Due to security concerns, backslash-escaping an expando is treated as a quoting error
QTest::newRow("backslash-escaping")
<< QString("echo \\%{file}") << QString("echo \\%{file}") << Utils::OsTypeLinux << file;
QTest::newRow("expando-within-shell-substitution") QTest::newRow("expando-within-shell-substitution")
<< QString("${VAR:-%{file}}") << QString("${VAR:-foo.txt}") << Utils::OsTypeLinux << QString("${VAR:-%{file}}") << QString("${VAR:-foo.txt}") << Utils::OsTypeLinux
<< file; << file;
@@ -286,7 +282,6 @@ private slots:
Val{"%{x}", "\\", OsTypeWindows}, Val{"%{x}", "\\", OsTypeWindows},
Val{"%{y}", "\"\"\\^\"\"\"", OsTypeWindows}, Val{"%{y}", "\"\"\\^\"\"\"", OsTypeWindows},
Val{"%{z}", "\"\"", OsTypeWindows}, Val{"%{z}", "\"\"", OsTypeWindows},
Val{"^%{z}%{z}", "^%{z}%{z}", OsTypeWindows}, // stupid user check
Val{"quoted", 0, OsTypeWindows}, Val{"quoted", 0, OsTypeWindows},
Val{"\"%{a}\"", "\"hi\"", OsTypeWindows}, Val{"\"%{a}\"", "\"hi\"", OsTypeWindows},
@@ -440,7 +435,6 @@ private slots:
Val{"%{e}", "'h\"i'", OsTypeLinux}, Val{"%{e}", "'h\"i'", OsTypeLinux},
Val{"%{f}", "'h'\\''i'", OsTypeLinux}, Val{"%{f}", "'h'\\''i'", OsTypeLinux},
Val{"%{z}", "''", OsTypeLinux}, Val{"%{z}", "''", OsTypeLinux},
Val{"\\%{z}%{z}", "\\%{z}%{z}", OsTypeLinux}, // stupid user check
Val{"single-quoted", 0, OsTypeLinux}, Val{"single-quoted", 0, OsTypeLinux},
Val{"'%{a}'", "'hi'", OsTypeLinux}, Val{"'%{a}'", "'hi'", OsTypeLinux},
@@ -495,7 +489,6 @@ private slots:
MacroExpander expander; MacroExpander expander;
if (os == Utils::OsTypeWindows) { if (os == Utils::OsTypeWindows) {
expander.registerVariable("a", "", [] { return "hi"; });
expander.registerVariable("aa", "", [] { return "hi ho"; }); expander.registerVariable("aa", "", [] { return "hi ho"; });
expander.registerVariable("b", "", [] { return "h\\i"; }); expander.registerVariable("b", "", [] { return "h\\i"; });
expander.registerVariable("c", "", [] { return "\\hi"; }); expander.registerVariable("c", "", [] { return "\\hi"; });
@@ -512,20 +505,32 @@ private slots:
expander.registerVariable("k", "", [] { return "&special;"; }); expander.registerVariable("k", "", [] { return "&special;"; });
expander.registerVariable("x", "", [] { return "\\"; }); expander.registerVariable("x", "", [] { return "\\"; });
expander.registerVariable("y", "", [] { return "\""; }); expander.registerVariable("y", "", [] { return "\""; });
expander.registerVariable("z", "", [] { return ""; });
} else { } else {
expander.registerVariable("a", "", [] { return "hi"; });
expander.registerVariable("b", "", [] { return "hi ho"; }); expander.registerVariable("b", "", [] { return "hi ho"; });
expander.registerVariable("c", "", [] { return "&special;"; }); expander.registerVariable("c", "", [] { return "&special;"; });
expander.registerVariable("d", "", [] { return "h\\i"; }); expander.registerVariable("d", "", [] { return "h\\i"; });
expander.registerVariable("e", "", [] { return "h\"i"; }); expander.registerVariable("e", "", [] { return "h\"i"; });
expander.registerVariable("f", "", [] { return "h'i"; }); expander.registerVariable("f", "", [] { return "h'i"; });
expander.registerVariable("z", "", [] { return ""; });
} }
expander.registerVariable("a", "", [] { return "hi"; });
expander.registerVariable("z", "", [] { return ""; });
QCOMPARE(expander.expandProcessArgs(in, os), out); QCOMPARE(expander.expandProcessArgs(in, os), out);
} }
void testProcessArgsFails()
{
MacroExpander expander;
expander.registerVariable("z", "", [] { return ""; });
expander.registerVariable("file", "", [] { return "foo.txt"; });
QVERIFY(!expander.expandProcessArgs("\\%{z}%{z}", OsTypeLinux));
QVERIFY(!expander.expandProcessArgs("echo \\%{file}", OsTypeLinux));
QVERIFY(!expander.expandProcessArgs("^%{z}%{z}", OsTypeWindows));
}
void testMacroExpander_data() void testMacroExpander_data()
{ {
QTest::addColumn<QString>("in"); QTest::addColumn<QString>("in");