From d6ad587ab82cdbd129cc1d4de654114c8b6174f4 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Wed, 8 Apr 2020 21:05:27 +0200 Subject: [PATCH] Travis: Build clang jobs with LuaJIT enabled for better coverage --- util/travis/common.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/util/travis/common.sh b/util/travis/common.sh index b186632e1..cf9ce020e 100644 --- a/util/travis/common.sh +++ b/util/travis/common.sh @@ -18,11 +18,17 @@ set_linux_compiler_env() { # Linux build only install_linux_deps() { - sudo apt-get update - sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng-dev \ + local pkgs=(libirrlicht-dev cmake libbz2-dev libpng-dev \ libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \ libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \ - gettext libpq-dev postgresql-server-dev-all libleveldb-dev + gettext libpq-dev postgresql-server-dev-all libleveldb-dev) + # for better coverage, build some jobs with luajit + if [[ "$CC" == "clang"* && -z "$VALGRIND$FREETYPE" ]]; then + pkgs+=(libluajit-5.1-dev) + fi + + sudo apt-get update + sudo apt-get install -y --no-install-recommends ${pkgs[@]} } # Mac OSX build only -- 2.25.1