From 020c5a2a48f8ce4717968b1d2e2c728a92a77181 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 1 Oct 2022 09:57:39 -0400 Subject: scripts/buildtests.sh - build in Debug mode --- scripts/buildtests.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/buildtests.sh b/scripts/buildtests.sh index b670ea09..c379ddce 100755 --- a/scripts/buildtests.sh +++ b/scripts/buildtests.sh @@ -553,6 +553,7 @@ then fi fi +DEFCMAKEOPTS="-DCMAKE_BUILD_TYPE=Debug" CMAKEOPTS="-DCMAKE_BUILD_TYPE=Debug -DGOBJECT_INTROSPECTION=False -DICAL_GLIB=False -DICAL_BUILD_DOCS=False" UUCCMAKEOPTS="$CMAKEOPTS -DCMAKE_DISABLE_FIND_PACKAGE_ICU=True" TZCMAKEOPTS="$CMAKEOPTS -DUSE_BUILTIN_TZDATA=True" @@ -570,7 +571,7 @@ CLANGTIDY test2 "$CMAKEOPTS" CLANGTIDY test2builtin "$TZCMAKEOPTS" #GCC based build tests -GCC_BUILD testgcc1 "" +GCC_BUILD testgcc1 "$DEFCMAKEOPTS" GCC_BUILD testgcc2 "$CMAKEOPTS" GCC_BUILD testgcc3 "$UUCCMAKEOPTS" GCC_BUILD testgcc4glib "$GLIBOPTS" @@ -584,7 +585,7 @@ GCC_BUILD testgcc1builtin "-DUSE_BUILTIN_TZDATA=True" GCC_BUILD testgcc2builtin "$TZCMAKEOPTS" #Ninja build tests -NINJA_GCC_BUILD testninjagcc1 "" +NINJA_GCC_BUILD testninjagcc1 "$DEFCMAKEOPTS" NINJA_GCC_BUILD testninjagcc2 "-DICAL_GLIB=True" NINJA_GCC_BUILD testninjagcc3 "-DICAL_GLIB=True -DICAL_GLIB_VAPI=ON -DGOBJECT_INTROSPECTION=True" NINJA_GCC_BUILD testninjagcc4 "-DSHARED_ONLY=True -DICAL_GLIB=False" @@ -593,7 +594,7 @@ NINJA_GCC_BUILD testninjagcc6 "-DSTATIC_ONLY=True -DICAL_GLIB=False" NINJA_GCC_BUILD testninjagcc7 "-DSTATIC_ONLY=True -DICAL_GLIB=True -DENABLE_GTK_DOC=False" NINJA_GCC_BUILD testninjagcc9 "-DSHARED_ONLY=True -DICAL_GLIB=True -DGOBJECT_INTROSPECTION=True -DICAL_GLIB_VAPI=ON" -CLANG_BUILD testclang1 "" +CLANG_BUILD testclang1 "$DEFCMAKEOPTS" CLANG_BUILD testclang2 "$CMAKEOPTS" CLANG_BUILD testclang3 "$UUCCMAKEOPTS" CLANG_BUILD testclang4glib "$GLIBOPTS" @@ -605,14 +606,14 @@ then fi #Address sanitizer -ASAN_BUILD test1asan "" +ASAN_BUILD test1asan "$DEFCMAKEOPTS" ASAN_BUILD test2asan "$CMAKEOPTS" ASAN_BUILD test3asan "$TZCMAKEOPTS" ASAN_BUILD test4asan "$UUCCMAKEOPTS" ASAN_BUILD test5asan "$GLIBOPTS" #Thread sanitizer -TSAN_BUILD test1tsan "" +TSAN_BUILD test1tsan "$DEFCMAKEOPTS" TSAN_BUILD test2tsan "$CMAKEOPTS" TSAN_BUILD test3tsan "$TZCMAKEOPTS" TSAN_BUILD test4tsan "$UUCCMAKEOPTS" -- cgit v1.2.1