diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-26 17:53:49 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-26 17:53:49 +0200 |
| commit | 41b49a16d62f5c759e4f8053cefa10b3f0390b31 (patch) | |
| tree | e0a24fb8f1f96021220eb5fc894fccfac2247189 /coin/instructions | |
| parent | ff94459c809e2ccd13e6d669b053667d35b3e571 (diff) | |
| parent | 52f29458d7d6cb379d28d84021819516723d9169 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I75984f35bcdeeeb3b6004a00670f1582ab522c1b
Diffstat (limited to 'coin/instructions')
| -rw-r--r-- | coin/instructions/execute_test_instructions.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/instructions/execute_test_instructions.yaml b/coin/instructions/execute_test_instructions.yaml index 87abb476c..a00f5676e 100644 --- a/coin/instructions/execute_test_instructions.yaml +++ b/coin/instructions/execute_test_instructions.yaml @@ -30,7 +30,7 @@ instructions: - type: ExecuteCommand command: "c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=\\Users\\qt\\work\\install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" maxTimeInSeconds: 14400 - maxTimeBetweenOutput: 300 + maxTimeBetweenOutput: 500 enable_if: condition: property property: host.os |