aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/testdata/env-merging
Commit message (Collapse)AuthorAgeFilesLines
* Remove the base module import from most test data projectsJoerg Bornemann2018-06-221-2/+0
| | | | | | | | Keep the base import in blackbox/testdata/deprecated-property to ensure we don't accidentally break it. Change-Id: I790da21a7490ec9c1b0335f45e8707e7e04daa7c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Allow rules without output artifactsChristian Kandeler2018-05-281-4/+1
| | | | | | | | | | | | It is occasionally useful to have a rule whose purpose lies solely in its "side effects", that is, it does not produce any actual files. This patch removes the necessity to declare a dummy artifact in that case. [ChangeLog] Added support for rules without output artifacts Change-Id: I38e76a5ddc78ffa768e8ae1f270ae2f7461c5ee7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Process commands: Fix environment merging for some path list variablesChristian Kandeler2017-12-222-0/+36
The value of Command.environment is supposed to be added to the general build environment. Variables containing lists should be merged rather than overwritten, as the code has done so far. This is difficult to get right in the general case, as we'd need a way to find out which variables contain lists. For now, use a fixed set of well-known and important path list variables (PATH is particularly relevant). Change-Id: I860302550b8005cbe10ee7d06dcca2b5edfaf475 Reviewed-by: Jake Petroules <jake.petroules@qt.io>