From b4aa32988a941ca2533f66e87caa393d13f69b0b Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 13 Sep 2020 14:48:10 +0100 Subject: [PATCH] Simplify ci/run.sh --- ci/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/run.sh b/ci/run.sh index 52574802..61903b5d 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -8,7 +8,7 @@ source conan/bin/activate if [[ "$(uname -s)" == 'Linux' ]]; then if [ "$CC" == "clang" ]; then # clang + Ubuntu don't like to run with UBSAN, but ASAN works - export CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=\"-fsanitize=address\" -DCMAKE_C_FLAGS=\"-fsanitize=address\" -DCMAKE_EXE_LINKER_FLAGS=\"-fsanitize=address\" -DCMAKE_MODULE_LINKER_FLAGS=\"-fsanitize=address\"" + export CMAKE_OPTIONS="$CMAKE_OPTIONS" elif [ -n "$WITH_VALGRIND" ]; then export EXIV2_VALGRIND="valgrind --quiet" else @@ -23,7 +23,7 @@ mkdir build cd build conan install .. -o webready=True --build missing cmake ${CMAKE_OPTIONS} -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install .. -make -j 2 +make -j make tests make install