diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-03-17 13:26:05 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-03-17 15:14:36 +0000 |
| commit | b0a05777f2d89d7986fa78ab761d08b4bf2ae89b (patch) | |
| tree | 67c6dc1f670de2258250715d186bf32593542699 | |
| parent | 11e2e036bf7f06cc62b4ed31e356725a4a479ff8 (diff) | |
fix Tests::environmentVariablesCaseInsensitivity for dynamic builds
Do not override the PATH environment variable. Otherwise jom cannot be
started in this particular blackbox test when using a non-static Qt.
Change-Id: I1a228817886604207335718c564224a7c205de3d
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| -rw-r--r-- | tests/makefiles/blackbox/environmentVariablesCaseInsensitivity/test.mk | 4 | ||||
| -rw-r--r-- | tests/tests.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/makefiles/blackbox/environmentVariablesCaseInsensitivity/test.mk b/tests/makefiles/blackbox/environmentVariablesCaseInsensitivity/test.mk index de5fdf5..1cf5cce 100644 --- a/tests/makefiles/blackbox/environmentVariablesCaseInsensitivity/test.mk +++ b/tests/makefiles/blackbox/environmentVariablesCaseInsensitivity/test.mk @@ -1,3 +1,3 @@ -PATH = $(PATH);C:\Zort +VAR1 = $(VAR1);C:\Zort first: - echo PATH $(PATH) %%PATH%% + echo VAR1 $(VAR1) %%VAR1%% diff --git a/tests/tests.cpp b/tests/tests.cpp index 30fbb54..eb78042 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -1080,13 +1080,13 @@ void Tests::environmentVariables() void Tests::environmentVariablesCaseInsensitivity() { - const QStringList environment = QStringList() << "Path=foobidoo"; + const QStringList environment = QStringList() << "Var1=foobidoo"; m_jomProcess->setEnvironment(environment); - QVERIFY(runJom(QStringList() << "/f" << "test.mk" << "/sl" << "PATH=C:\\Narf", + QVERIFY(runJom(QStringList() << "/f" << "test.mk" << "/sl" << "VAR1=C:\\Narf", "blackbox/environmentVariablesCaseInsensitivity")); QCOMPARE(m_jomProcess->exitCode(), 0); const QByteArray output = m_jomProcess->readAllStandardOutput().trimmed(); - QCOMPARE(output.data(), "PATH C:\\Narf C:\\Narf"); + QCOMPARE(output.data(), "VAR1 C:\\Narf C:\\Narf"); } void Tests::environmentVariablesInCommands() |