diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-07 15:18:53 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-07 13:44:03 +0000 |
| commit | b0ce136201260c77ceb06102c1aa64c0d700ab23 (patch) | |
| tree | 8c7ac545b4a878a1a6dd84d2b22461457d12f757 | |
| parent | 97c630a062af0ba75b22b227d7b4fe37a63a04d3 (diff) | |
Fix "qtScxml" autotest
Append to the environment, rather than overwriting.
Change-Id: I2d70f16dc08b4302ccffb9fdfa47c3e97284195d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | tests/auto/blackbox/testdata/qtscxml/qtscxml.qbs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata/qtscxml/qtscxml.qbs b/tests/auto/blackbox/testdata/qtscxml/qtscxml.qbs index 23bb982a9..9610825ec 100644 --- a/tests/auto/blackbox/testdata/qtscxml/qtscxml.qbs +++ b/tests/auto/blackbox/testdata/qtscxml/qtscxml.qbs @@ -1,4 +1,5 @@ import qbs +import qbs.Environment import qbs.FileInfo Project { @@ -43,7 +44,9 @@ Project { pathVar = "LD_LIBRARY_PATH"; pathValue = input.Qt.core.libPath; } - cmd.environment = [pathVar + '=' + pathValue]; + var oldValue = Environment.getEnv(pathVar) || ""; + var newValue = pathValue + product.qbs.pathListSeparator + oldValue; + cmd.environment = [pathVar + '=' + newValue]; return [cmd]; } } |