From d9861e0f1178d38040e7adff3deffa2d5647d1f2 Mon Sep 17 00:00:00 2001 From: Pavel Sountsov Date: Wed, 6 Feb 2019 19:12:39 -0800 Subject: [PATCH 1/3] Add SDL to the travis script. --- .travis.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7254949d6d..d54119d450 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,20 +8,21 @@ compiler: - clang - gcc -before_install: +env: + - WANT_SHADERS_GL=on ALLEGRO_SDL=on + - WANT_SHADERS_GL=on ALLEGRO_SDL=off + - WANT_SHADERS_GL=off ALLEGRO_SDL=off + +install: - if [ `uname` = "Linux" ]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sudo apt-get update; - sudo apt-get install -y libvorbis-dev libtheora-dev libwebp-dev libphysfs-dev libopusfile-dev libdumb1-dev libflac-dev libpulse-dev libgtk2.0-dev pandoc libcurl4-nss-dev libenet-dev pulseaudio libasound2-dev libopenal-dev; + sudo apt-get install -y libvorbis-dev libtheora-dev libwebp-dev libphysfs-dev libopusfile-dev libdumb1-dev libflac-dev libpulse-dev libgtk2.0-dev pandoc libcurl4-nss-dev libenet-dev pulseaudio libasound2-dev libopenal-dev libsdl2-dev libegl1-mesa-dev libgles2-mesa-dev; elif [ `uname` = "Darwin" ]; then - brew update && brew install opusfile libvorbis webp freetype flac physfs dumb theora enet; + brew update && brew install opusfile libvorbis webp freetype flac physfs dumb theora enet sdl2; fi -env: - - WANT_SHADERS_GL=on - - WANT_SHADERS_GL=off - before_script: - mkdir build - cd build @@ -29,7 +30,7 @@ before_script: script: - | if [ `uname` = "Linux" ]; then - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWANT_SHADERS_GL=$WANT_SHADERS_GL -DWANT_CURL_EXAMPLE=on + cmake .. -DCMAKE_BUILD_TYPE=Debug -DWANT_SHADERS_GL=$WANT_SHADERS_GL -DALLEGRO_SDL=$ALLEGRO_SDL -DWANT_CURL_EXAMPLE=on make . ../tests/grab_bitmap_suites.sh find ../tests -name '*.ini' | grep -v 'compressed' | xargs tests/test_driver | tee /tmp/test_out @@ -40,7 +41,7 @@ script: pulseaudio -D ./install_test elif [ `uname` = "Darwin" ]; then - cmake .. -DWANT_SHADERS_GL=$WANT_SHADERS_GL -G Xcode + cmake .. -DWANT_SHADERS_GL=$WANT_SHADERS_GL -DALLEGRO_SDL=$ALLEGRO_SDL -G Xcode xcodebuild fi From a221bbe09bd952a205698a752061bad70971d2a2 Mon Sep 17 00:00:00 2001 From: Pavel Sountsov Date: Wed, 6 Feb 2019 19:46:24 -0800 Subject: [PATCH 2/3] Don't run the install test with SDL, as there's no dialog addon. --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d54119d450..be86390a94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,11 +35,13 @@ script: . ../tests/grab_bitmap_suites.sh find ../tests -name '*.ini' | grep -v 'compressed' | xargs tests/test_driver | tee /tmp/test_out grep -q 'failed tests: 0' /tmp/test_out - sudo make install - sudo ldconfig - gcc ../misc/install_test.c -o install_test $(pkg-config --cflags --libs allegro_image-debug-5 allegro_ttf-debug-5 allegro_acodec-debug-5 allegro_dialog-debug-5 allegro_primitives-debug-5 allegro_video-debug-5) - pulseaudio -D - ./install_test + if [ ${ALLEGRO_SDL} = "off";] then + sudo make install + sudo ldconfig + gcc ../misc/install_test.c -o install_test $(pkg-config --cflags --libs allegro_image-debug-5 allegro_ttf-debug-5 allegro_acodec-debug-5 allegro_dialog-debug-5 allegro_primitives-debug-5 allegro_video-debug-5) + pulseaudio -D + ./install_test + fi elif [ `uname` = "Darwin" ]; then cmake .. -DWANT_SHADERS_GL=$WANT_SHADERS_GL -DALLEGRO_SDL=$ALLEGRO_SDL -G Xcode xcodebuild From 00e8328f5078fb28da08fccc9ec586f8c885c0b3 Mon Sep 17 00:00:00 2001 From: SiegeLord Date: Thu, 7 Feb 2019 18:25:01 -0800 Subject: [PATCH 3/3] Fix it --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index be86390a94..d2d9ed8e6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ script: . ../tests/grab_bitmap_suites.sh find ../tests -name '*.ini' | grep -v 'compressed' | xargs tests/test_driver | tee /tmp/test_out grep -q 'failed tests: 0' /tmp/test_out - if [ ${ALLEGRO_SDL} = "off";] then + if [ ${ALLEGRO_SDL} = "off" ]; then sudo make install sudo ldconfig gcc ../misc/install_test.c -o install_test $(pkg-config --cflags --libs allegro_image-debug-5 allegro_ttf-debug-5 allegro_acodec-debug-5 allegro_dialog-debug-5 allegro_primitives-debug-5 allegro_video-debug-5)