aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs2
-rw-r--r--tests/auto/api/tst_api.cpp11
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp4
-rw-r--r--tests/auto/blackbox/tst_blackboxapple.cpp3
-rw-r--r--tests/auto/blackbox/tst_clangdb.cpp3
-rw-r--r--tests/auto/tools/tst_tools.cpp48
6 files changed, 39 insertions, 32 deletions
diff --git a/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs b/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs
index 7633b3ebe..fe3cacd6d 100644
--- a/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs
+++ b/tests/auto/api/testdata/excluded-inputs/excluded-inputs.qbs
@@ -92,7 +92,7 @@ Project {
Rule {
multiplex: true
explicitlyDependsOnFromDependencies: "the_tag"
- excludedAuxiliaryInputs: "the_other_tag"
+ excludedInputs: "the_other_tag"
Artifact {
filePath: "dummy3.txt"
fileTags: "p_type"
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp
index 58150150a..c998b81e8 100644
--- a/tests/auto/api/tst_api.cpp
+++ b/tests/auto/api/tst_api.cpp
@@ -2268,8 +2268,12 @@ void TestApi::processResult()
QCOMPARE(expectedExitCode == 0, result.success());
QCOMPARE(result.error(), QProcess::UnknownError);
struct CheckParams {
- CheckParams(bool r, const QString &f, const QByteArray &c, const QStringList &co)
- : redirect(r), fileName(f), expectedContent(c), consoleOutput(co) {}
+ CheckParams(bool r, QString f, QByteArray c, QStringList co)
+ : redirect(r)
+ , fileName(std::move(f))
+ , expectedContent(std::move(c))
+ , consoleOutput(std::move(co))
+ {}
bool redirect;
QString fileName;
QByteArray expectedContent;
@@ -2847,7 +2851,8 @@ void TestApi::toolInModule()
const QList<qbs::ProductData> products = projectData.products();
QCOMPARE(products.size(), 1);
const qbs::ProductData product = products.front();
- for (const qbs::GroupData &group : product.groups())
+ const auto groups = product.groups();
+ for (const qbs::GroupData &group : groups)
QVERIFY(group.name() != "thetool binary");
const std::unique_ptr<qbs::BuildJob> buildJob(setupJob->project()
.buildAllProducts(qbs::BuildOptions()));
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index bc187b210..ca11e4e3e 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -6093,14 +6093,14 @@ static bool haveInnoSetup(const Profile &profile)
QStringList paths = QProcessEnvironment::systemEnvironment().value("PATH")
.split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts);
- for (const QString &key : regKeys) {
+ for (const QString &key : qAsConst(regKeys)) {
QSettings settings(key, QSettings::NativeFormat);
QString str = settings.value(QStringLiteral("InstallLocation")).toString();
if (!str.isEmpty())
paths.prepend(str);
}
- for (const QString &path : paths) {
+ for (const QString &path : qAsConst(paths)) {
if (regularFileExists(QDir::fromNativeSeparators(path) +
HostOsInfo::appendExecutableSuffix(QStringLiteral("/ISCC"))))
return true;
diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp
index 7cbc07b95..d9cabe270 100644
--- a/tests/auto/blackbox/tst_blackboxapple.cpp
+++ b/tests/auto/blackbox/tst_blackboxapple.cpp
@@ -749,7 +749,8 @@ void TestBlackboxApple::xcode()
QVERIFY2(xcodebuildShowSdks.waitForStarted(), qPrintable(xcodebuildShowSdks.errorString()));
QVERIFY2(xcodebuildShowSdks.waitForFinished(), qPrintable(xcodebuildShowSdks.errorString()));
QVERIFY2(xcodebuildShowSdks.exitCode() == 0, qPrintable(xcodebuildShowSdks.readAllStandardError().constData()));
- for (const QString &line : QString::fromLocal8Bit(xcodebuildShowSdks.readAllStandardOutput().trimmed()).split('\n', QString::SkipEmptyParts)) {
+ const auto lines = QString::fromLocal8Bit(xcodebuildShowSdks.readAllStandardOutput().trimmed()).split('\n', QString::SkipEmptyParts);
+ for (const QString &line : lines) {
static const std::regex regexp("^.+\\s+\\-sdk\\s+([a-z]+)([0-9]+\\.[0-9]+)$");
const auto ln = line.toStdString();
std::smatch match;
diff --git a/tests/auto/blackbox/tst_clangdb.cpp b/tests/auto/blackbox/tst_clangdb.cpp
index 6a4072dd8..3a6dd2d92 100644
--- a/tests/auto/blackbox/tst_clangdb.cpp
+++ b/tests/auto/blackbox/tst_clangdb.cpp
@@ -111,7 +111,8 @@ void TestClangDb::ensureBuildTreeCreated()
if (m_qbsStdout.contains("is msvc") || m_qbsStdout.contains("is mingw")) {
sanitizeOutput(&m_qbsStdout);
- for (const auto &line : m_qbsStdout.split('\n')) {
+ const auto lines = m_qbsStdout.split('\n');
+ for (const auto &line : lines) {
static const QByteArray includeEnv = "INCLUDE=";
static const QByteArray libEnv = "LIB=";
static const QByteArray pathEnv = "PATH=";
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp
index da40a2dc6..a6c699232 100644
--- a/tests/auto/tools/tst_tools.cpp
+++ b/tests/auto/tools/tst_tools.cpp
@@ -679,10 +679,10 @@ void TestTools::set_begin()
Set<int> set2 = set1;
{
- Set<int>::const_iterator i = set1.constBegin();
- Set<int>::const_iterator j = set1.cbegin();
- Set<int>::const_iterator k = set2.constBegin();
- Set<int>::const_iterator ell = set2.cbegin();
+ const auto i = set1.constBegin();
+ const auto j = set1.cbegin();
+ const auto k = set2.constBegin();
+ const auto ell = set2.cbegin();
QVERIFY(i == j);
QVERIFY(k == ell);
@@ -691,10 +691,10 @@ void TestTools::set_begin()
set1.insert(44);
{
- Set<int>::const_iterator i = set1.constBegin();
- Set<int>::const_iterator j = set1.cbegin();
- Set<int>::const_iterator k = set2.constBegin();
- Set<int>::const_iterator ell = set2.cbegin();
+ const auto i = set1.constBegin();
+ const auto j = set1.cbegin();
+ const auto k = set2.constBegin();
+ const auto ell = set2.cbegin();
QVERIFY(i == j);
QVERIFY(k == ell);
@@ -703,10 +703,10 @@ void TestTools::set_begin()
set2 = set1;
{
- Set<int>::const_iterator i = set1.constBegin();
- Set<int>::const_iterator j = set1.cbegin();
- Set<int>::const_iterator k = set2.constBegin();
- Set<int>::const_iterator ell = set2.cbegin();
+ const auto i = set1.constBegin();
+ const auto j = set1.cbegin();
+ const auto k = set2.constBegin();
+ const auto ell = set2.cbegin();
QVERIFY(i == j);
QVERIFY(k == ell);
@@ -719,10 +719,10 @@ void TestTools::set_end()
Set<int> set2 = set1;
{
- Set<int>::const_iterator i = set1.constEnd();
- Set<int>::const_iterator j = set1.cend();
- Set<int>::const_iterator k = set2.constEnd();
- Set<int>::const_iterator ell = set2.cend();
+ const auto i = set1.constEnd();
+ const auto j = set1.cend();
+ const auto k = set2.constEnd();
+ const auto ell = set2.cend();
QVERIFY(i == j);
QVERIFY(k == ell);
@@ -734,10 +734,10 @@ void TestTools::set_end()
set1.insert(44);
{
- Set<int>::const_iterator i = set1.constEnd();
- Set<int>::const_iterator j = set1.cend();
- Set<int>::const_iterator k = set2.constEnd();
- Set<int>::const_iterator ell = set2.cend();
+ const auto i = set1.constEnd();
+ const auto j = set1.cend();
+ const auto k = set2.constEnd();
+ const auto ell = set2.cend();
QVERIFY(i == j);
QVERIFY(k == ell);
@@ -749,10 +749,10 @@ void TestTools::set_end()
set2 = set1;
{
- Set<int>::const_iterator i = set1.constEnd();
- Set<int>::const_iterator j = set1.cend();
- Set<int>::const_iterator k = set2.constEnd();
- Set<int>::const_iterator ell = set2.cend();
+ const auto i = set1.constEnd();
+ const auto j = set1.cend();
+ const auto k = set2.constEnd();
+ const auto ell = set2.cend();
QVERIFY(i == j);
QVERIFY(k == ell);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 16:55:35 +0000