Simplify ci/run.sh

main
clanmills 5 years ago
parent c50cf7d88d
commit b4aa32988a

@ -8,7 +8,7 @@ source conan/bin/activate
if [[ "$(uname -s)" == 'Linux' ]]; then if [[ "$(uname -s)" == 'Linux' ]]; then
if [ "$CC" == "clang" ]; then if [ "$CC" == "clang" ]; then
# clang + Ubuntu don't like to run with UBSAN, but ASAN works # 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 elif [ -n "$WITH_VALGRIND" ]; then
export EXIV2_VALGRIND="valgrind --quiet" export EXIV2_VALGRIND="valgrind --quiet"
else else
@ -23,7 +23,7 @@ mkdir build
cd build cd build
conan install .. -o webready=True --build missing conan install .. -o webready=True --build missing
cmake ${CMAKE_OPTIONS} -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install .. cmake ${CMAKE_OPTIONS} -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install ..
make -j 2 make -j
make tests make tests
make install make install

Loading…
Cancel
Save