From b8b2d4f985b8f23bf156afcc32b30f8adc55827e Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Fri, 30 Oct 2015 17:59:14 +0100 Subject: Remove the build+test script, just specify everything in the CI file --- .gitlab-ci.yml | 18 ++++++++++++------ scripts/build_and_run_tests.sh | 8 -------- 2 files changed, 12 insertions(+), 14 deletions(-) delete mode 100755 scripts/build_and_run_tests.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49bb935..f653bcf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,24 +3,30 @@ before_script: botan_cares_systemd_idn: script: - - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - make -j$(nproc) biboumi coverage botan_cares_systemd: script: - - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITHOUT_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITHOUT_LIBIDN=1 + - make -j$(nproc) biboumi coverage botan_cares_idn: script: - - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITHOUT_SYSTEMD=1 -DWITH_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_BOTAN=1 -DWITH_CARES=1 -DWITHOUT_SYSTEMD=1 -DWITH_LIBIDN=1 + - make -j$(nproc) biboumi coverage botan_systemd_idn: script: - - ../scripts/build_and_run_tests.sh -DWITH_BOTAN=1 -DWITHOUT_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_BOTAN=1 -DWITHOUT_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - make -j$(nproc) biboumi coverage cares_systemd_idn: script: - - ../scripts/build_and_run_tests.sh -DWITHOUT_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITHOUT_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITH_LIBIDN=1 + - make -j$(nproc) biboumi coverage cares_systemd: script: - - ../scripts/build_and_run_tests.sh -DWITHOUT_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITHOUT_LIBIDN=1 + - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITHOUT_BOTAN=1 -DWITH_CARES=1 -DWITH_SYSTEMD=1 -DWITHOUT_LIBIDN=1 + - make -j$(nproc) biboumi coverage diff --git a/scripts/build_and_run_tests.sh b/scripts/build_and_run_tests.sh deleted file mode 100755 index 43d32c1..0000000 --- a/scripts/build_and_run_tests.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e -x - -cmake .. -DCMAKE_BUILD_TYPE=Debug $@ -make -j$(nproc) biboumi test_suite -make -j$(nproc) check -make -j$(nproc) coverage -- cgit v1.2.3