From cf04bc8eeabf48984301ae9a4ce6b0ae27a08340 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sat, 6 Jul 2019 20:49:42 +0200 Subject: Speed up TestBlackboxJobLimits This test runs for quite a long time on Travis and is reason why jobs got killed. This patch decreases the spent time by 40% on macOS (~5min -> ~3min) Change-Id: Iaab8ba08f5b43c65655eaad61812def60047f581 Reviewed-by: Qbs CI Bot Reviewed-by: Christian Kandeler --- tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs | 2 +- tests/auto/blackbox/testdata-joblimits/job-limits/main.cpp | 2 +- tests/auto/blackbox/tst_blackboxjoblimits.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs b/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs index 1ab369c88..221105a64 100644 --- a/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs +++ b/tests/auto/blackbox/testdata-joblimits/job-limits/job-limits.qbs @@ -63,7 +63,7 @@ Project { outputFileTags: "tool_in" outputArtifacts: { var artifacts = []; - for (var i = 0; i < 7; ++i) + for (var i = 0; i < 5; ++i) artifacts.push({filePath: "file" + i + ".in", fileTags: "tool_in"}); return artifacts; } diff --git a/tests/auto/blackbox/testdata-joblimits/job-limits/main.cpp b/tests/auto/blackbox/testdata-joblimits/job-limits/main.cpp index 0a94c6393..ec9acba80 100644 --- a/tests/auto/blackbox/testdata-joblimits/job-limits/main.cpp +++ b/tests/auto/blackbox/testdata-joblimits/job-limits/main.cpp @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) return 4; } } - std::this_thread::sleep_for(std::chrono::milliseconds(100)); + std::this_thread::sleep_for(std::chrono::milliseconds(50)); fclose(lockFile); std::FILE * const output = std::fopen(argv[1], "w"); if (!output) { diff --git a/tests/auto/blackbox/tst_blackboxjoblimits.cpp b/tests/auto/blackbox/tst_blackboxjoblimits.cpp index 0c366759d..89b5f638e 100644 --- a/tests/auto/blackbox/tst_blackboxjoblimits.cpp +++ b/tests/auto/blackbox/tst_blackboxjoblimits.cpp @@ -165,7 +165,7 @@ void TestBlackboxJobLimits::jobLimits() else QVERIFY2(m_qbsStderr.contains("exclusive"), m_qbsStderr.constData()); if (exitCode == 0) - QCOMPARE(m_qbsStdout.count("Running tool"), 7); + QCOMPARE(m_qbsStdout.count("Running tool"), 5); } QTEST_MAIN(TestBlackboxJobLimits) -- cgit v1.2.3