From 4183491aea8ac6c252ab83b24f75a3d3079907cc Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 30 Dec 2022 11:08:36 +0900 Subject: .gitlab-ci.yml: consolidate duplicate "aggressive" targets The UB+ASAN-Werror.Fedora.x86_64.gcc-aggressive shared almost same tasks with UB+ASAN-Werror-aggressive.Fedora.x86_64.gcc, except the former explicitly specified --disable-hardware-acceleration. Signed-off-by: Daiki Ueno --- .gitlab-ci.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abf9af147f..3b51456ce2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,44 +269,6 @@ UB+ASAN-Werror-aggressive.Fedora.x86_64.gcc: except: - tags -# ASan with -DAGGRESSIVE_REALLOC is set -# Two runs, one with normal backend and another with pkcs11 trust store -UB+ASAN-Werror.Fedora.x86_64.gcc-aggressive: - extends: - - .test - - .fedora - needs: - - fedora/bootstrap - script: - - export UBSAN_OPTIONS=print_stacktrace=1 - - export LSAN_OPTIONS=suppressions=$(pwd)/devel/lsan.supp - - export CFLAGS="-std=c99 -O1 -g -Wno-cpp -Werror -fno-omit-frame-pointer -fsanitize=undefined,bool,alignment,null,enum,bounds-strict,address,leak,nonnull-attribute -fno-sanitize-recover=all -fsanitize-address-use-after-scope -DAGGRESSIVE_REALLOC" - - export CXXFLAGS="$CFLAGS" - - dash ./configure --cache-file $CCACHE_FILE --disable-doc --disable-hardware-acceleration - - sed -i 's/-fanalyzer//g' lib/Makefile - - sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile - - make -j$BUILDJOBS - # Use $BUILDJOBS since the fuzzers should use mainly CPU (no blocking I/O) - - make -j$BUILDJOBS check -C fuzz - - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x1 - - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x2 - - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x4 - - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x8 - - make -j$BUILDJOBS check -C fuzz GNUTLS_CPUID_OVERRIDE=0x20 - - make -j$CHECKJOBS check -C tests - - dash ./configure --cache-file $CCACHE_FILE --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/-fanalyzer//g' lib/Makefile - - sed -i 's/-Werror/-Wno-parentheses -Werror/g' src/Makefile - - make -j$BUILDJOBS - # Use $BUILDJOBS since most of the job is building all tests, then just running 4 tests - - make -j$BUILDJOBS check -C tests TESTS="trust-store p11-kit-load.sh priority-init2 set-default-prio" SUBDIRS=. - tags: - - shared - - linux - except: - - tags - ############################################################################## ########################### Fedora pipelines ################################# ############################################################################## -- cgit v1.2.1