[igt-dev] [PATCH i-g-t] gitlab-ci: add tests for MIPS

Guillaume Tucker guillaume.tucker at collabora.com
Thu Jun 27 13:30:58 UTC 2019


Use the libatomic1:mips package only in the Debian Stretch Docker
image for MIPS and add Gitlab CI step to run tests on MIPS.

Signed-off-by: Guillaume Tucker <guillaume.tucker at collabora.com>
---
 .gitlab-ci.yml         | 14 ++++++++++++++
 Dockerfile.debian-mips |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37184b98f5da..665fbb79c523 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,6 +173,20 @@ test:ninja-test-armhf:
       - build
     when: on_failure
 
+test:ninja-test-mips:
+  image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-mips:latest
+  dependencies:
+    - build:tests-debian-meson-mips
+  stage: test
+  script:
+    - export PKG_CONFIG_PATH=/usr/lib/mips-linux-gnu/pkgconfig/
+    - env > build/envdump.txt
+    - ninja -C build test
+  artifacts:
+    paths:
+      - build
+    when: on_failure
+
 test:test-list-diff:
   dependencies:
     - build:tests-debian-autotools
diff --git a/Dockerfile.debian-mips b/Dockerfile.debian-mips
index ebe08db644ea..ee29f5f4ccda 100644
--- a/Dockerfile.debian-mips
+++ b/Dockerfile.debian-mips
@@ -5,7 +5,6 @@ RUN apt-get install -y \
 			flex \
 			bison \
 			pkg-config \
-			libatomic1 \
 			x11proto-dri2-dev \
 			python-docutils \
 			valgrind \
@@ -15,6 +14,7 @@ RUN dpkg --add-architecture mips
 RUN apt-get update
 RUN apt-get install -y \
 			gcc-mips-linux-gnu \
+			libatomic1:mips \
 			libpciaccess-dev:mips \
 			libkmod-dev:mips \
 			libprocps-dev:mips \
-- 
2.20.1



More information about the igt-dev mailing list