xserver: Branch 'master'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Dec 11 17:49:59 UTC 2018
hw/xfree86/dri2/dri2.c | 1 -
test/scripts/run-piglit.sh | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 899d260701ff783254f8ead91dab8dc515d554f6
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Dec 11 12:30:59 2018 -0500
ci: Work around broken python UTF8 handling in the CI docker image
Gitlab very kindly exposes the details of the git commit message (among
much else) in the environment. Unfortunately, piglit tries to handle the
environment in non-UTF8-safe ways, which means if the top-of-tree commit
mentions non-ASCII characters (say, in the author's name) then all the
tests fail and so does the pipeline.
Fortunately none of those variables are things our piglit invocation
needs. Since I've failed to rebuild the docker image as yet, just clear
the likely variables from the environment before running piglit.
This-makes-me: ☹
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 6619e3aa7..266d6e66d 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -38,7 +38,6 @@
#ifdef WITH_LIBDRM
#include <xf86drm.h>
#endif
-#include "xf86Module.h"
#include "list.h"
#include "scrnintstr.h"
#include "windowstr.h"
diff --git a/test/scripts/run-piglit.sh b/test/scripts/run-piglit.sh
index b999c2598..224ef24bd 100755
--- a/test/scripts/run-piglit.sh
+++ b/test/scripts/run-piglit.sh
@@ -1,5 +1,8 @@
#!/bin/sh
+# workaround for the docker image not being sufficiently python3 yet
+unset CI_COMMIT_TAG CI_COMMIT_MESSAGE CI_COMMIT_TITLE CI_COMMIT_DESCRIPTION
+
set -e
if test "x$XTEST_DIR" = "x"; then
More information about the xorg-commit
mailing list