From d799dc10b6045837dd58a1945b3227a2b08d40d6 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Mon, 26 Oct 2015 03:20:22 +0100 Subject: Test a different way to do our CI Introduce a script, which is called with different parameters, to have a number of builds done with a different configuration, without repeating things too much. --- .gitlab-ci.yml | 34 ++++++++++++++++++++++++++-------- scripts/build_and_run_tests.sh | 7 +++++++ 2 files changed, 33 insertions(+), 8 deletions(-) create mode 100755 scripts/build_and_run_tests.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 855c4a6..49bb935 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,26 @@ -job: - script: - - mkdir build/ - - cd build/ - - cmake .. - - make -j8 - - make test_suite - - ./test_suite +before_script: + - mkdir build && cd build/ + +botan_cares_systemd_idn: + script: + - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + +botan_cares_systemd: + script: + - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITHOUT_LIBIDN=1 + +botan_cares_idn: + script: + - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITHOUT_SYSTEMD=1 -DWITH_LIBIDN=1 + +botan_systemd_idn: + script: + - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITHOUT_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + +cares_systemd_idn: + script: + - ../scripts/build_and_run_tests.sh -DWITHOUT_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + +cares_systemd: + script: + - ../scripts/build_and_run_tests.sh -DWITHOUT_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITHOUT_LIBIDN=1 diff --git a/scripts/build_and_run_tests.sh b/scripts/build_and_run_tests.sh new file mode 100755 index 0000000..69a27fd --- /dev/null +++ b/scripts/build_and_run_tests.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e -x + +cmake .. $@ +make -j$(nproc) biboumi test_suite +./test_suite -- cgit v1.2.3