diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2020-03-31 08:39:20 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2020-04-24 09:34:34 +0300 |
| commit | 6586c4abce30301afa1f3f9ed32ad468447ed03f (patch) | |
| tree | 2f475004ea6c2fc2e0256034b310caa988a85c3d | |
| parent | 96a9bdb0209f17394903bfafacdf1ec46a0e5a9f (diff) | |
Enable tests
Remove DisableTests property.
Change-Id: Ifa524f2f399e7b3072825a2ef34e752187c34be4
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| -rw-r--r-- | coin/instructions/make_check_instructions.yaml | 6 | ||||
| -rw-r--r-- | coin/module_config.yaml | 3 | ||||
| -rw-r--r-- | tests/auto/installer/packagemanagercore/BLACKLIST | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/coin/instructions/make_check_instructions.yaml b/coin/instructions/make_check_instructions.yaml index a341f53b0..a2aac5dac 100644 --- a/coin/instructions/make_check_instructions.yaml +++ b/coin/instructions/make_check_instructions.yaml @@ -23,7 +23,7 @@ instructions: maxTimeBetweenOutput: 120 userMessageOnFailure: "Failed to change into tests directory." - type: ExecuteCommand - command: "{{.InstallDir}}/bin/qmake.exe INSTALL_PREFIX={{.InstallDir}}" + command: "{{.InstallDir}}/bin/qmake.exe INSTALL_PREFIX={{.InstallDir}} IFW_LIB_PATH={{.InstallDir}}/lib" maxTimeInSeconds: 600 maxTimeBetweenOutput: 600 userMessageOnFailure: "Failed running qmake, check logs." @@ -57,7 +57,7 @@ instructions: maxTimeBetweenOutput: 120 userMessageOnFailure: "Failed to change into tests directory." - type: ExecuteCommand - command: "{{.InstallDir}}/bin/qmake INSTALL_PREFIX={{.InstallDir}}" + command: "{{.InstallDir}}/bin/qmake INSTALL_PREFIX={{.InstallDir}} IFW_LIB_PATH={{.InstallDir}}/lib" maxTimeInSeconds: 600 maxTimeBetweenOutput: 600 userMessageOnFailure: "Failed running qmake, check logs." @@ -86,7 +86,7 @@ instructions: maxTimeBetweenOutput: 120 userMessageOnFailure: "Failed to change into tests directory." - type: ExecuteCommand - command: "c:{{.InstallDir}}\\bin\\qmake.exe INSTALL_PREFIX={{.InstallDir}}" + command: "c:{{.InstallDir}}\\bin\\qmake.exe INSTALL_PREFIX={{.InstallDir}} IFW_LIB_PATH={{.InstallDir}}/lib" maxTimeInSeconds: 600 maxTimeBetweenOutput: 600 userMessageOnFailure: "Failed running qmake, check logs." diff --git a/coin/module_config.yaml b/coin/module_config.yaml index d6f275b8a..c0e84c92d 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -14,9 +14,6 @@ accept_configuration: property: features contains_value: Packaging - condition: property - property: features - contains_value: DisableTests - - condition: property property: configureArgs contains_value: -static diff --git a/tests/auto/installer/packagemanagercore/BLACKLIST b/tests/auto/installer/packagemanagercore/BLACKLIST new file mode 100644 index 000000000..3ba5ffe5d --- /dev/null +++ b/tests/auto/installer/packagemanagercore/BLACKLIST @@ -0,0 +1,2 @@ +[testDisallowRunningProcess] +macos |