From d6263f9ca4fc8c74cd84d4e1491acc910565267e Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sun, 12 Aug 2018 02:38:32 +0300 Subject: [PATCH] Arranged release script to what scripts from Jenkins expect [#METRIQA-2330] --- release | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/release b/release index e38c9d7d610..735fa648bfa 100755 --- a/release +++ b/release @@ -73,10 +73,10 @@ done # Build options if [ -n "$SANITIZER" ] then - if [[ "$SANITIZER" == "address" ]]; then VERSION_POSTFIX+="asan" - elif [[ "$SANITIZER" == "thread" ]]; then VERSION_POSTFIX+="tsan" - elif [[ "$SANITIZER" == "memory" ]]; then VERSION_POSTFIX+="msan" - elif [[ "$SANITIZER" == "undefined" ]]; then VERSION_POSTFIX+="ubsan" + if [[ "$SANITIZER" == "address" ]]; then VERSION_POSTFIX+="+asan" + elif [[ "$SANITIZER" == "thread" ]]; then VERSION_POSTFIX+="+tsan" + elif [[ "$SANITIZER" == "memory" ]]; then VERSION_POSTFIX+="+msan" + elif [[ "$SANITIZER" == "undefined" ]]; then VERSION_POSTFIX+="+ubsan" else echo "Unknown value of SANITIZER variable: $SANITIZER" exit 3 @@ -87,10 +87,10 @@ then EXTRAPACKAGES="$EXTRAPACKAGES clang-6.0 lld-6.0" elif [[ $BUILD_TYPE == 'valgrind' ]]; then MALLOC_OPTS="-DENABLE_TCMALLOC=0 -DENABLE_JEMALLOC=0" - VERSION_POSTFIX+=+$BUILD_TYPE + VERSION_POSTFIX+="+valgrind" elif [[ $BUILD_TYPE == 'debug' ]]; then CMAKE_BUILD_TYPE=Debug - VERSION_POSTFIX+=+$BUILD_TYPE + VERSION_POSTFIX+="+debug" fi CMAKE_FLAGS=" $MALLOC_OPTS -DSANITIZE=$SANITIZER -DENABLE_EMBEDDED_COMPILER=1 $CMAKE_FLAGS"