tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add expression test runner to Bazel (#1464)

Browse Source
This commit is contained in:
Bart Louwers
2023-08-05 09:48:15 +02:00
committed by GitHub
parent 3c57d37ef2
commit 15bf44da97
12 changed files with 68 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/linux-ci.yml vendored
View File

@@ -213,8 +213,8 @@ jobs:
xvfb-run -a \
bazel coverage --combined_report=lcov --instrumentation_filter="//:mbgl-core" --//:maplibre_platform=linux \
--test_output=errors --local_test_jobs=1 \
--test_env=DISPLAY --test_env=XAUTHORITY --define=CI_BUILD=1 \
//test:core
--test_env=DISPLAY --test_env=XAUTHORITY --copt="-DCI_BUILD" \
//test:core //expression-test:test
- name: Upload coverage report
if: '!cancelled()'

19
expression-test/BUILD.bazel
View File

@@ -18,3 +18,22 @@ cc_library(
"//:mbgl-core",
],
)
cc_test(
name = "test",
size = "small",
srcs = glob(
[
"*.cpp",
"*.hpp",
],
allow_empty = False,
),
copts = CPP_FLAGS + MAPLIBRE_FLAGS,
data = [
"//metrics:expression-test-files",
],
deps = [
"//platform/linux:impl",
],
)

6
expression-test/CMakeLists.txt
View File

@@ -11,11 +11,6 @@ add_executable(
${PROJECT_SOURCE_DIR}/expression-test/main.cpp
)
target_compile_definitions(
mbgl-expression-test
PRIVATE TEST_RUNNER_ROOT_PATH="${PROJECT_SOURCE_DIR}"
)
# FIXME: Should not use core private interface
target_include_directories(
mbgl-expression-test
@@ -27,7 +22,6 @@ target_link_libraries(
PRIVATE
Mapbox::Base
Mapbox::Base::Extras::args
Mapbox::Base::Extras::filesystem
mbgl-core
mbgl-compiler-options
)

4
expression-test/expression_test_logger.cpp
View File

@@ -1,11 +1,11 @@
#include "expression_test_logger.hpp"
#include "expression_test_runner.hpp"
#include "filesystem.hpp"
#include <mbgl/util/io.hpp>
#include <mbgl/util/string.hpp>
#include <sstream>
#include <filesystem>
using namespace mbgl;
using namespace std::literals;
@@ -172,7 +172,7 @@ void printStats(const TestStats& stats) {
}
void writeHTMLResults(const TestStats& stats, const std::string& rootPath, bool shuffle, uint32_t seed) {
filesystem::path path = filesystem::path(rootPath) / "index.html"s;
std::filesystem::path path = std::filesystem::path(rootPath) / "index.html"s;
try {
util::write_file(path.string(), createResultPage(stats, shuffle, seed));
printf("Results at: %s\n", path.string().c_str());

25
expression-test/expression_test_parser.cpp
View File

@@ -53,8 +53,8 @@ void writeJSON(rapidjson::PrettyWriter<rapidjson::StringBuffer>& writer, const V
using ErrorMessage = std::string;
using JSONReply = variant<JSDocument, ErrorMessage>;
JSONReply readJson(const filesystem::path& jsonPath) {
auto maybeJSON = util::readFile(jsonPath);
JSONReply readJson(const std::filesystem::path& jsonPath) {
auto maybeJSON = util::readFile(jsonPath.string());
if (!maybeJSON) {
return {"Unable to open file "s + jsonPath.string()};
}
@@ -309,8 +309,9 @@ bool parseInputs(const JSValue& inputsValue, TestData& data) {
} // namespace
std::tuple<filesystem::path, std::vector<filesystem::path>, bool, uint32_t> parseArguments(int argc, char** argv) {
args::ArgumentParser argumentParser("Mapbox GL Expression Test Runner");
std::tuple<std::filesystem::path, std::vector<std::filesystem::path>, bool, uint32_t> parseArguments(int argc,
char** argv) {
args::ArgumentParser argumentParser("MapLibre Native Expression Test Runner");
args::HelpFlag helpFlag(argumentParser, "help", "Display this help menu", {'h', "help"});
args::Flag shuffleFlag(argumentParser, "shuffle", "Toggle shuffling the tests order", {'s', "shuffle"});
@@ -339,13 +340,13 @@ std::tuple<filesystem::path, std::vector<filesystem::path>, bool, uint32_t> pars
exit(2);
}
filesystem::path rootPath{std::string(TEST_RUNNER_ROOT_PATH).append("/metrics/integration/expression-tests")};
if (!filesystem::exists(rootPath)) {
const auto rootPath = std::filesystem::current_path().append("metrics/integration/expression-tests");
if (!std::filesystem::exists(rootPath)) {
Log::Error(Event::General, "Test path '" + rootPath.string() + "' does not exist.");
exit(3);
}
std::vector<filesystem::path> paths;
std::vector<std::filesystem::path> paths;
for (const auto& testName : args::get(testNameValues)) {
paths.emplace_back(rootPath.string() + "/" + testName);
}
@@ -356,15 +357,15 @@ std::tuple<filesystem::path, std::vector<filesystem::path>, bool, uint32_t> pars
auto testFilter = testFilterValue ? args::get(testFilterValue) : std::string{};
// Recursively traverse through the test paths and collect test directories containing "test.json".
std::vector<filesystem::path> testPaths;
std::vector<std::filesystem::path> testPaths;
testPaths.reserve(paths.size());
for (const auto& path : paths) {
if (!filesystem::exists(path)) {
if (!std::filesystem::exists(path)) {
Log::Warning(Event::General, "Provided test folder '" + path.string() + "' does not exist.");
continue;
}
for (auto& testPath : filesystem::recursive_directory_iterator(path)) {
for (auto& testPath : std::filesystem::recursive_directory_iterator(path)) {
if (!testFilter.empty() && !std::regex_search(testPath.path().string(), std::regex(testFilter))) {
continue;
}
@@ -382,7 +383,7 @@ std::tuple<filesystem::path, std::vector<filesystem::path>, bool, uint32_t> pars
Ignores parseExpressionIgnores() {
Ignores ignores;
const auto mainIgnoresPath = filesystem::path(TEST_RUNNER_ROOT_PATH).append("metrics/ignores/platform-all.json");
const auto mainIgnoresPath = std::filesystem::current_path().append("metrics/ignores/platform-all.json");
auto maybeIgnores = readJson(mainIgnoresPath);
if (!maybeIgnores.is<JSDocument>()) { // NOLINT
return {};
@@ -401,7 +402,7 @@ Ignores parseExpressionIgnores() {
return ignores;
}
std::optional<TestData> parseTestData(const filesystem::path& path) {
std::optional<TestData> parseTestData(const std::filesystem::path& path) {
try {
TestData data;
auto maybeJson = readJson(path.string());

9
expression-test/expression_test_parser.hpp
View File

@@ -1,7 +1,5 @@
#pragma once
#include "filesystem.hpp"
#include <mbgl/style/expression/expression.hpp>
#include <mbgl/util/feature.hpp>
#include <mbgl/util/rapidjson.hpp>
@@ -9,6 +7,7 @@
#include <set>
#include <string>
#include <vector>
#include <filesystem>
using namespace mbgl;
@@ -79,12 +78,12 @@ struct Ignore {
std::string reason;
};
using Arguments = std::tuple<filesystem::path, std::vector<filesystem::path>, bool, uint32_t>;
using Arguments = std::tuple<std::filesystem::path, std::vector<std::filesystem::path>, bool, uint32_t>;
Arguments parseArguments(int argc, char** argv);
using Ignores = std::vector<Ignore>;
Ignores parseExpressionIgnores();
std::optional<TestData> parseTestData(const filesystem::path&);
std::optional<TestData> parseTestData(const std::filesystem::path&);
std::string toJSON(const Value& value, unsigned indent = 0, bool singleLine = false);
JSDocument toDocument(const Value&);
@@ -96,4 +95,4 @@ std::unique_ptr<style::expression::Expression> parseExpression(const JSValue&,
TestResult&);
std::unique_ptr<style::expression::Expression> parseExpression(const std::optional<Value>&,
std::optional<PropertySpec>&,
TestResult&);
TestResult&);

4
expression-test/expression_test_runner.cpp
View File

@@ -1,7 +1,6 @@
#include "expression_test_runner.hpp"
#include "expression_test_logger.hpp"
#include "expression_test_parser.hpp"
#include "filesystem.hpp"
#include "test_runner_common.hpp"
#include <mbgl/util/io.hpp>
@@ -12,6 +11,7 @@
#include <sstream>
#include <regex>
#include <filesystem>
using namespace std::literals;
@@ -87,7 +87,7 @@ void writeTestData(const JSDocument& document, const std::string& rootPath, cons
writer.SetIndent(' ', 2);
document.Accept(writer);
buffer.Put('\n');
filesystem::path path = filesystem::path(rootPath) / id / "test.json"s;
std::filesystem::path path = std::filesystem::path(rootPath) / id / "test.json"s;
try {
util::write_file(path.string(), {buffer.GetString(), buffer.GetSize()});
} catch (std::exception&) {

9
expression-test/filesystem.hpp
View File

@@ -1,9 +0,0 @@
#pragma once
#include <ghc/filesystem.hpp>
namespace mbgl {
namespace filesystem = ghc::filesystem;
} // namespace mbgl

9
expression-test/main.cpp
View File

@@ -2,13 +2,18 @@
#include "expression_test_runner.hpp"
#include "expression_test_logger.hpp"
#include <mbgl/util/logging.hpp>
#include <random>
#include <iostream>
#include <filesystem>
int main(int argc, char** argv) try {
Log::useLogThread(false);
// Parse args
std::vector<mbgl::filesystem::path> testPaths;
mbgl::filesystem::path rootPath;
std::vector<std::filesystem::path> testPaths;
std::filesystem::path rootPath;
bool shuffle;
uint32_t seed;
std::tie(rootPath, testPaths, shuffle, seed) = parseArguments(argc, argv);

15
metrics/BUILD.bazel
View File

@@ -24,3 +24,18 @@ filegroup(
"//render-test:__subpackages__",
],
)
filegroup(
name = "expression-test-files",
srcs = glob(
[
"integration/expression-tests/**",
],
allow_empty = False,
) + [
"ignores/platform-all.json",
],
visibility = [
"//expression-test:__pkg__",
],
)

6
platform/linux/src/headless_backend_glx.cpp
View File

@@ -7,6 +7,7 @@
#ifdef CI_BUILD
#include <chrono>
#include <thread>
#include <iostream>
#endif
#include <GL/glx.h>
@@ -31,7 +32,7 @@ public:
#ifdef CI_BUILD
// XOpenDisplay has proven very unreliable on CI, perform some retries if it fails
constexpr auto CI_RETRIES = 10;
constexpr auto CI_RETRIES = 20;
for (int i = 0; i < CI_RETRIES; i++) {
#endif
xDisplay = XOpenDisplay(nullptr);
@@ -39,7 +40,8 @@ public:
if (xDisplay != nullptr) {
break;
}
Log::Debug(Event::OpenGL, "[CI] Failed to open X display, retrying...");
// std::cerr is used because the tests expect logging to be deterministic
std::cerr << "[CI] Failed to open X display, retrying..." << std::endl;
std::this_thread::sleep_for(std::chrono::milliseconds(500));
}
#endif

1
test/BUILD.bazel
View File

@@ -26,7 +26,6 @@ cc_library(
"src/mbgl/test/*.hpp",
]),
copts = CPP_FLAGS + MAPLIBRE_FLAGS,
defines = ["CI_BUILD"],
strip_include_prefix = "src",
deps = [
"testutils",