summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2021-03-02 09:44:29 +0200
committerKatja Marttila <katja.marttila@qt.io>2021-03-05 08:59:08 +0000
commit53edc30b7eeab161cdd2fc9d6b28c85c515a674e (patch)
tree11c5ecee1c2a00146bebf7ca119614b7d41a9241
parent841e003068658c8b9fb02d15b6f267788cf60e07 (diff)
Fix test running
Apparently it is not enough to unset the MAKEFLAGS for jom. It still was running test in parallel and trying to write results to same file. Change-Id: Id0c968dde4c2d005e71a1895e3d2190e8685f3ec Reviewed-by: Katja Marttila <katja.marttila@qt.io> (cherry picked from commit 4687686a64057618e58931912b8a12997fa0f1a3) Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
-rw-r--r--coin/instructions/make_check_instructions.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/instructions/make_check_instructions.yaml b/coin/instructions/make_check_instructions.yaml
index a2aac5dac..9253fa548 100644
--- a/coin/instructions/make_check_instructions.yaml
+++ b/coin/instructions/make_check_instructions.yaml
@@ -103,7 +103,7 @@ instructions:
- type: RunQtUnitTest
testRepetitionAllowance: 3
directory: "{{.SourceDir}}/tests/auto"
- runTestCommand: ["jom", "check"]
+ runTestCommand: ["jom", "check", "-j1"]
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 600
userMessageOnFailure: "Failed to run make check, check logs."