summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2020-01-03 13:55:09 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2020-01-03 13:58:52 +0100
commit1abc198689eb645fddd1ffffe5e795d86b45825d (patch)
tree5fb36e18c157461cd2ac7dc0d444d85ff76abed4
parent47277554d97562c85608ac9b378e3a938cada6a9 (diff)
downloadgnutls-tmp-check-fuzz.tar.gz
.gitlab-ci.yml: merged ASAN and UBSAN runstmp-check-fuzz
This in addition to merging the two CI runs, it also attempts to run the fuzz code under SHANI for CI. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--.gitlab-ci.yml43
1 files changed, 8 insertions, 35 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f12eb87b9..e75461f65a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -226,39 +226,6 @@ valgrind.Fedora.x86_64:
- tests/*/*.log
retry: 1
-# Two runs, one with normal backend and another with pkcs11 trust store
-asan.Fedora.x86_64:
- stage: stage1-testing
- image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
- script:
- - SUBMODULE_NOFETCH=1 ./bootstrap
- - CFLAGS="-fsanitize=address -g -O2" CXXFLAGS=$CFLAGS LDFLAGS="-static-libasan"
- dash ./configure --disable-gcc-warnings --disable-doc --cache-file cache/config.cache --disable-non-suiteb-curves --disable-guile
- - make -j$(nproc)
- - LSAN_OPTIONS="suppressions=$(pwd)/devel/lsan.supp" make check -j$(nproc)
- - LSAN_OPTIONS="suppressions=$(pwd)/devel/lsan.supp" make -C fuzz check -j$(nproc) GNUTLS_CPUID_OVERRIDE=0x1
- - LSAN_OPTIONS="suppressions=$(pwd)/devel/lsan.supp" make -C fuzz check -j$(nproc) GNUTLS_CPUID_OVERRIDE=0x2
- - LSAN_OPTIONS="suppressions=$(pwd)/devel/lsan.supp" make -C fuzz check -j$(nproc) GNUTLS_CPUID_OVERRIDE=0x4
- - LSAN_OPTIONS="suppressions=$(pwd)/devel/lsan.supp" make -C fuzz check -j$(nproc) GNUTLS_CPUID_OVERRIDE=0x8
- - CFLAGS="-fsanitize=address -g -O2" CXXFLAGS=$CFLAGS LDFLAGS="-static-libasan"
- dash ./configure --cache-file cache/config.cache --disable-doc --with-system-priority-file=/etc/crypto-policies/back-ends/gnutls.config --with-default-priority-string=@SYSTEM --with-default-trust-store-pkcs11="pkcs11:" --disable-guile
- - make -j$(nproc)
- - make -C tests check -j$(nproc) TESTS="trust-store p11-kit-load.sh priority-init2 set-default-prio" SUBDIRS=.
- tags:
- - shared
- except:
- - tags
- artifacts:
- expire_in: 1 week
- when: on_failure
- paths:
- - ./*.log
- - fuzz/*.log
- - tests/*.log
- - tests/*/*.log
- - tests/suite/*/*.log
- retry: 1
-
threadsan.Fedora.x86_64:
stage: stage1-testing
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
@@ -488,12 +455,17 @@ UB+ASAN-Werror.Fedora.x86_64.gcc:
- sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile
- make -j$(nproc)
- make check -j$(nproc) -C fuzz
+ - make check -j$(nproc) -C fuzz GNUTLS_CPUID_OVERRIDE=0x1
+ - make check -j$(nproc) -C fuzz GNUTLS_CPUID_OVERRIDE=0x2
+ - make check -j$(nproc) -C fuzz GNUTLS_CPUID_OVERRIDE=0x4
+ - make check -j$(nproc) -C fuzz GNUTLS_CPUID_OVERRIDE=0x8
+ - make check -j$(nproc) -C fuzz GNUTLS_CPUID_OVERRIDE=0x20
- make check -j$(nproc) -C tests
- - dash ./configure --cache-file cache/config.cache --disable-guile --disable-doc --disable-hardware-acceleration --with-default-trust-store-pkcs11="pkcs11:"
+ - dash ./configure --cache-file cache/config.cache --disable-guile --disable-doc --disable-hardware-acceleration --with-default-trust-store-pkcs11="pkcs11:" --with-system-priority-file=/etc/crypto-policies/back-ends/gnutls.config --with-default-priority-string=@SYSTEM
- make clean
- sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile
- make -j$(nproc)
- - make check -j$(nproc) -C tests TESTS="trust-store p11-kit-load.sh" SUBDIRS=.
+ - make check -j$(nproc) -C tests TESTS="trust-store p11-kit-load.sh priority-init2 set-default-prio" SUBDIRS=.
tags:
- shared
except:
@@ -504,6 +476,7 @@ UB+ASAN-Werror.Fedora.x86_64.gcc:
paths:
- guile/tests/*.log
- ./*.log
+ - fuzz/*.log
- tests/*.log
- tests/*/*.log
- tests/suite/*/*.log