summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalle Viironen <kalle.viironen@qt.io>2023-08-28 10:44:58 +0300
committerKalle Viironen <kalle.viironen@qt.io>2023-11-03 16:31:57 +0300
commite51cd47ed39016c6adc8e55770681f183e2c3ef0 (patch)
treedd4302e94cd43c589e52aba0a21f8f338c5b9ff4
parent90e1e1ee8607d5555ea5b1b4e8cda505e92f716a (diff)
Make checkBlackLists() return bool
Make checkBlackLists() return true if the test is blacklisted and false otherwise. Change-Id: Ief400a10a47ec7c21ea1d37fe75c7dc08739e06c Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rw-r--r--src/testlib/qtestblacklist.cpp4
-rw-r--r--src/testlib/qtestblacklist_p.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index 4c30f7b5e9..d3f01883e2 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -279,7 +279,8 @@ void parseBlackList()
}
}
-void checkBlackLists(const char *slot, const char *data, const char *global)
+// Returns \c true if this test-case is blacklisted.
+bool checkBlackLists(const char *slot, const char *data, const char *global)
{
bool ignore = ignoreAll;
@@ -302,6 +303,7 @@ void checkBlackLists(const char *slot, const char *data, const char *global)
}
QTestResult::setBlacklistCurrentTest(ignore);
+ return ignore;
}
} // QTestPrivate
diff --git a/src/testlib/qtestblacklist_p.h b/src/testlib/qtestblacklist_p.h
index 2bc9b684ab..3bba0e7672 100644
--- a/src/testlib/qtestblacklist_p.h
+++ b/src/testlib/qtestblacklist_p.h
@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
namespace QTestPrivate {
// Export functions so they can also be used by QQuickTest
Q_TESTLIB_EXPORT void parseBlackList();
- Q_TESTLIB_EXPORT void checkBlackLists(const char *slot, const char *data,
+ Q_TESTLIB_EXPORT bool checkBlackLists(const char *slot, const char *data,
const char *global = nullptr);
}