diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-06-28 16:32:02 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-07-03 18:25:49 +0000 |
| commit | 832f2e94d3e780e1c990c66a59df18403f060ba7 (patch) | |
| tree | 7df5255c2c3038dcb4a841c0b4649ae21530df94 /tests | |
| parent | 327d665d708c7350c95e7a85c25d2c22f2f81c48 (diff) | |
Switch qbs-benchmarker to Qbs
This allows to better utilize processor cores when building qbs as well
as use ccache when set via profile:
profiles.gcc.cpp.compilerWrapper: "/usr/bin/ccache"
profiles.gcc.cpp.toolchainInstallPath: "/usr/bin"
profiles.gcc.qbs.toolchain: "gcc"
Change-Id: I4ba622777f1dd5d7c650a3d7399534043094c0b9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/benchmarker/benchmarker.cpp | 13 | ||||
| -rw-r--r-- | tests/benchmarker/valgrindrunner.cpp | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/tests/benchmarker/benchmarker.cpp b/tests/benchmarker/benchmarker.cpp index 3c5fcde4e..c6de412a3 100644 --- a/tests/benchmarker/benchmarker.cpp +++ b/tests/benchmarker/benchmarker.cpp @@ -32,6 +32,7 @@ #include "valgrindrunner.h" #include <QtConcurrent/qtconcurrentrun.h> +#include <QtCore/QCoreApplication> #include <iostream> #include <utility> @@ -118,9 +119,15 @@ void Benchmarker::buildQbs(const QString &buildDir) const { if (!QDir::root().mkpath(buildDir)) throw Exception(QStringLiteral("Failed to create directory '%1'.").arg(buildDir)); - runProcess(QStringList() << "qmake" << "CONFIG+=force_debug_info" - << (m_qbsRepo + "/qbs.pro"), buildDir); - runProcess(QStringList() << "make" << "-s", buildDir); + runProcess(QStringList() << QCoreApplication::applicationDirPath() + "/qbs" + << "resolve" + << "config:benchmarker" + << "qbs.buildVariant:profiling" + << "qbs.installPrefix:''" + << "-f" << m_qbsRepo + "/qbs.qbs", buildDir); + runProcess(QStringList() << QCoreApplication::applicationDirPath() + "/qbs" + << "build" + << "config:benchmarker", buildDir); } } // namespace qbsBenchmarker diff --git a/tests/benchmarker/valgrindrunner.cpp b/tests/benchmarker/valgrindrunner.cpp index 72745dc16..7509dbb52 100644 --- a/tests/benchmarker/valgrindrunner.cpp +++ b/tests/benchmarker/valgrindrunner.cpp @@ -48,7 +48,7 @@ ValgrindRunner::ValgrindRunner(Activities activities, QString testProject, const QString &qbsBuildDir, const QString &baseOutputDir) : m_activities(activities) , m_testProject(std::move(testProject)) - , m_qbsBinary(qbsBuildDir + "/bin/qbs") + , m_qbsBinary(qbsBuildDir + "/benchmarker/install-root/bin/qbs") , m_baseOutputDir(baseOutputDir) { if (!QDir::root().mkpath(m_baseOutputDir)) |