fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-01 03:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ci-test-x11' into 'master'

Browse source 
CI: Check test results for cairo-xcb and cairo-x11

See merge request cairo/cairo!165
This commit is contained in:
Uli Schlachter 2021-04-30 12:12:22 +00:00
commit 8f6cfe4177
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
.gitlab-ci.yml
View file

File diff suppressed because one or more lines are too long

9
test/cairo-test-runner.c
View file

@ -612,6 +612,7 @@ expect_fail_due_to_env_var (cairo_test_context_t *ctx,
char *env_name;
const char *env;
cairo_bool_t result = FALSE;
char *to_replace;
/* Construct the name of the env var */
env_name = malloc (strlen (prefix) + strlen (target->name) + 1 + strlen (content) + 1);
@ -625,6 +626,14 @@ expect_fail_due_to_env_var (cairo_test_context_t *ctx,
strcat (env_name, "_");
strcat (env_name, content);
/* Deal with some invalid characters: Replace '-' and '&' with '_' */
while ((to_replace = strchr(env_name, '-')) != NULL) {
*to_replace = '_';
}
while ((to_replace = strchr(env_name, '&')) != NULL) {
*to_replace = '_';
}
env = getenv (env_name);
/* Look for the test name in the env var (comma separated) */