summaryrefslogtreecommitdiff
path: root/test/cairo-test-runner.c
diff options
context:
space:
mode:
authorUli Schlachter <psychon@znc.in>2021-04-25 11:05:59 +0200
committerUli Schlachter <psychon@znc.in>2021-04-25 11:05:59 +0200
commit4d3dfb7bcba78b4072552095871f647e90469f05 (patch)
treee6fb8e764ae74117d063612ea1a8eed23359aae2 /test/cairo-test-runner.c
parent845c1f2a9aa94f52fb89e92c4c2c2f82400332af (diff)
downloadcairo-4d3dfb7bcba78b4072552095871f647e90469f05.tar.gz
.gitlab-ci.yml: Ignore current X11 test failures
Signed-off-by: Uli Schlachter <psychon@znc.in>
Diffstat (limited to 'test/cairo-test-runner.c')
-rw-r--r--test/cairo-test-runner.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/cairo-test-runner.c b/test/cairo-test-runner.c
index 39fad0580..f65f21a58 100644
--- a/test/cairo-test-runner.c
+++ b/test/cairo-test-runner.c
@@ -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) */