diff options
| author | Guillaume Tucker <guillaume.tucker@collabora.com> | 2019-06-27 14:30:58 +0100 |
|---|---|---|
| committer | Simon Ser <simon.ser@intel.com> | 2019-06-28 09:45:35 +0300 |
| commit | 5f6cf7070b249975bac4d747a9c44d81c94c4381 (patch) | |
| tree | 91699d7e70cfccffeb30a40fa79a9449e23fdcc3 | |
| parent | 3c4edeba35ac699db5b39600eb17f4151c6b42fd (diff) | |
gitlab-ci: add tests for MIPS
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@collabora.com>
Fixes: 439a9f5d615f ("gitlab-ci: add build for MIPS")
Reviewed-by: Simon Ser <simon.ser@intel.com>
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | Dockerfile.debian-mips | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37184b98..665fbb79 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 ebe08db6..ee29f5f4 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 \ |