summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2015-10-26 03:20:22 +0100
committerFlorent Le Coz <louiz@louiz.org>2015-10-26 20:00:52 +0100
commitd799dc10b6045837dd58a1945b3227a2b08d40d6 (patch)
tree02937492b8a462690bb82be36bb728479b57ec20
parentc8606e1858363f0f9b8f9cd8ac8b96dfe181fd31 (diff)
downloadbiboumi-d799dc10b6045837dd58a1945b3227a2b08d40d6.tar.gz
biboumi-d799dc10b6045837dd58a1945b3227a2b08d40d6.tar.bz2
biboumi-d799dc10b6045837dd58a1945b3227a2b08d40d6.tar.xz
biboumi-d799dc10b6045837dd58a1945b3227a2b08d40d6.zip
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.
-rw-r--r--.gitlab-ci.yml34
-rwxr-xr-xscripts/build_and_run_tests.sh7
2 files changed, 33 insertions, 8 deletions
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