diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-28 14:50:32 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-28 15:25:01 +0200 |
| commit | 4e894f14c0fda5578488f2cf6f659e3fc390c3c6 (patch) | |
| tree | 98c9484c2066d12d48a738dd18bcd73c64db1151 /tests/auto/qtcprocess/tst_qtcprocess.cpp | |
| parent | a82a553ea5fc7322aed7cdac714eeca00671aea5 (diff) | |
support tilde expansion under unix
Task-number: QTCREATORBUG-4239
Diffstat (limited to 'tests/auto/qtcprocess/tst_qtcprocess.cpp')
| -rw-r--r-- | tests/auto/qtcprocess/tst_qtcprocess.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/qtcprocess/tst_qtcprocess.cpp b/tests/auto/qtcprocess/tst_qtcprocess.cpp index bf8ebbbf23..55105e315e 100644 --- a/tests/auto/qtcprocess/tst_qtcprocess.cpp +++ b/tests/auto/qtcprocess/tst_qtcprocess.cpp @@ -76,10 +76,19 @@ private slots: private: Environment env; MacroMapExpander mx; +#ifdef Q_OS_UNIX + QString homeStr; + QString home; +#endif }; void tst_QtcProcess::initTestCase() { +#ifdef Q_OS_UNIX + homeStr = QLatin1String("@HOME@"); + home = QDir::homePath(); +#endif + env.set("empty", ""); env.set("word", "hi"); env.set("words", "hi ho"); @@ -161,12 +170,20 @@ void tst_QtcProcess::splitArgs_data() { "hi'", "", QtcProcess::BadQuoting }, { "hi\"dood", "", QtcProcess::BadQuoting }, { "$var", "'$var'", QtcProcess::SplitOk }, + { "~", "@HOME@", QtcProcess::SplitOk }, + { "~ foo", "@HOME@ foo", QtcProcess::SplitOk }, + { "foo ~", "foo @HOME@", QtcProcess::SplitOk }, + { "~/foo", "@HOME@/foo", QtcProcess::SplitOk }, + { "~foo", "'~foo'", QtcProcess::SplitOk }, #endif }; for (unsigned i = 0; i < sizeof(vals)/sizeof(vals[0]); i++) QTest::newRow(vals[i].in) << QString::fromLatin1(vals[i].in) << QString::fromLatin1(vals[i].out) +#ifdef Q_OS_UNIX + .replace(homeStr, home) +#endif << vals[i].err; } @@ -221,12 +238,19 @@ void tst_QtcProcess::prepareArgs_data() { "hi'", "", QtcProcess::BadQuoting }, { "hi\"dood", "", QtcProcess::BadQuoting }, { "$var", "", QtcProcess::FoundMeta }, + { "~", "@HOME@", QtcProcess::SplitOk }, + { "~ foo", "@HOME@ foo", QtcProcess::SplitOk }, + { "~/foo", "@HOME@/foo", QtcProcess::SplitOk }, + { "~foo", "", QtcProcess::FoundMeta }, #endif }; for (unsigned i = 0; i < sizeof(vals)/sizeof(vals[0]); i++) QTest::newRow(vals[i].in) << QString::fromLatin1(vals[i].in) << QString::fromLatin1(vals[i].out) +#ifdef Q_OS_UNIX + .replace(homeStr, home) +#endif << vals[i].err; } |