[igt-dev] [PATCH i-g-t 3/4] gitlab-ci: Compare test-list.txt(s) generated by meson and autotools

Arkadiusz Hiler
2018-10-24T13:00:14Z

Let's make sure that we haven't missed any tests with any of the
supported build systems.

Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
.gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 394cd86d..1814d8b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,8 @@ stages:
- test
- deploy

+#################### BUILD #########################
+
build:tests-fedora:
stage: build
script:
@@ -26,12 +28,17 @@ build:tests-fedora:
paths:
- build

-build:tests-debian:
+build:tests-debian-meson:
image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian:latest
stage: build
script:
- meson $MESON_OPTIONS build
- ninja -C build
+ - cp build/tests/test-list.txt meson-test-list.txt
+ artifacts:
+ paths:
+ - meson-test-list.txt
+

build:tests-debian-autotools:
image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian:latest
@@ -39,13 +46,31 @@ build:tests-debian-autotools:
script:
- ./autogen.sh --enable-{chamelium,audio,intel,amdgpu,nouveau,tests,runner}
- make -j
+ - cp tests/test-list.txt autotools-test-list.txt
+ artifacts:
+ paths:
+ - autotools-test-list.txt

-ninja:test:
+#################### TEST ##########################
+
+test:ninja-test:
+ dependencies:
+ - build:tests-fedora
+ stage: test
+ script: ninja -C build test
+
+test:test-list-diff:
+ dependencies:
+ - build:tests-debian-autotools
+ - build:tests-debian-meson
stage: test
- script:
- - ninja -C build test
+ script: diff <(sed "s/ /\n/g" meson-test-list.txt| sort) <(sed "s/ /\n/g" autotools-test-list.txt | sort)
+
+################### DEPLOY #########################

pages:
+ dependencies:
+ - build:tests-fedora
stage: deploy
script:
- ninja -C build igt-gpu-tools-doc
@@ -56,6 +81,8 @@ pages:
only:
- master

+################# CONTAINERS #######################
+
containers:igt-debian:
stage: containers
when: manual