AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add regular expression capability to SKQP unittest filter

Browse Source 
Current behavior, as an example, is to run every test not matching ".+ES3"
but this is subject to change based on Brian Osman's input

Bug: skia:12796
Change-Id: Ib798a6a6e6323ae0cf349010fce3f5982f2038bf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/498976
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Nathaniel Nifong <nifong@google.com>
This commit is contained in:
Nathaniel Nifong 2022-01-25 15:52:26 -05:00 committed by SkCQ
parent 493a9c0cbc
commit 9eb1679b77
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt Normal file
View File

@ -0,0 +1,3 @@
# Exclude all unit tests that end with the ES3 suffix because Android does not
# require ES3 support.
.+ES3

31
tools/skqp/src/skqp.cpp
View File

@ -33,6 +33,7 @@
#include <algorithm>
#include <cinttypes>
#include <sstream>
#include <regex>
namespace skqp {
@ -73,22 +74,34 @@ static void readlines(const void* data, size_t size, F f) {
}
}
static void get_unit_tests(SkQPAssetManager* mgr, std::vector<SkQP::UnitTest>* unitTests) {
std::unordered_set<std::string> testset;
auto insert = [&testset](const char* s, size_t l) {
// Parses the unittests.txt file.
// when exclude is true, all tests are run except those matching lines from the file
// when exclude is false, only tests matching lines from the file are run.
// Each line is a regular expression matching test names.
// Lines may start with # to indicate a comment
static void get_unit_tests(SkQPAssetManager* mgr, std::vector<SkQP::UnitTest>* unitTests, bool exclude) {
std::vector<std::regex> patterns;
auto insert = [&patterns](const char* s, size_t l) {
SkASSERT(l > 1) ;
if (l > 0 && s[l - 1] == '\n') { // strip line endings.
--l;
}
if (l > 0) { // only add non-empty strings.
testset.insert(std::string(s, l));
if (l > 0 && s[0] != '#') { // only add non-empty strings, and ignore comments.
patterns.emplace_back(std::string(s, l));
}
};
if (sk_sp<SkData> dat = mgr->open(kUnitTestsPath)) {
readlines(dat->data(), dat->size(), insert);
}
for (const skiatest::Test& test : skiatest::TestRegistry::Range()) {
if ((testset.empty() || testset.count(std::string(test.fName)) > 0) && test.fNeedsGpu) {
bool matches_one = false;
for (const auto& pat : patterns) {
if (std::regex_match(std::string(test.fName), pat)) {
matches_one = true;
continue;
}
}
if (exclude != matches_one && !test.fNeedsGpu) {
unitTests->push_back(&test);
}
}
@ -256,8 +269,10 @@ void SkQP::init(SkQPAssetManager* am, const char* renderTests, const char* repor
get_render_tests(fAssetManager, renderTests, &fGMs, &fGMThresholds);
/* If the file "skqp/unittests.txt" does not exist or is empty, run all gpu
unit tests. Otherwise only run tests mentioned in that file. */
get_unit_tests(fAssetManager, &fUnitTests);
unit tests. Otherwise run only tests that do not match a line in that file.
The list is checked in at platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
*/
get_unit_tests(fAssetManager, &fUnitTests, true);
fSupportedBackends = get_backends();
print_backend_info((fReportDirectory + "/grdump.txt").c_str(), fSupportedBackends);