diff --git a/.travis.yml b/.travis.yml index 863e9f5..e321d83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_install: - sudo sed -i -e 's|friend class hash|friend struct hash|' /usr/include/c++/4.8/bits/stl_bvector.h - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi script: - - cmake . -DSDL2PP_ENABLE_GUI_TEST=OFF -DCMAKE_INSTALL_PREFIX=`pwd`.prefix -DSDL2PP_WITH_WERROR=YES -DSDL2PP_CXXSTD=$SDL2PP_CXXSTD + - cmake . -DSDL2PP_ENABLE_LIVE_TESTS=OFF -DCMAKE_INSTALL_PREFIX=`pwd`.prefix -DSDL2PP_WITH_WERROR=YES -DSDL2PP_CXXSTD=$SDL2PP_CXXSTD - make && make test && make install - cppcheck -I . --enable=style,performance,portability,information,missingInclude --error-exitcode=2 SDL2pp - "if make doxygen 2>&1 | grep 'warning:'; then echo 'FATAL: doxygen warnings!'; false; fi" diff --git a/CMakeLists.txt b/CMakeLists.txt index bfe9f79..e747382 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,7 +202,7 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # examples and tests OPTION(SDL2PP_WITH_EXAMPLES "Build examples" ON) OPTION(SDL2PP_WITH_TESTS "Build tests" ON) - OPTION(SDL2PP_ENABLE_GUI_TEST "Enable GUI test (requires X11 display)" ON) + OPTION(SDL2PP_ENABLE_LIVE_TESTS "Enable live tests (require X11 display and audio device)" ON) IF(SDL2PP_WITH_EXAMPLES) ADD_SUBDIRECTORY(examples) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 103ec2e..734e6ef 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,10 +6,9 @@ SET(CLI_TESTS test_error ) -# tests which test graphics functionality and thus requre working -# and OpenGL-enabled X11 display -SET(GUI_TESTS - gui_rendering +# live tests require X11 display and/or audio output +SET(LIVE_TESTS + live_rendering ) # disable self-move warning: it's deliberately used in tests @@ -36,10 +35,10 @@ FOREACH(TEST ${CLI_TESTS}) ADD_TEST(${TEST} ${TEST}) ENDFOREACH(TEST ${TESTS}) -FOREACH(TEST ${GUI_TESTS}) +FOREACH(TEST ${LIVE_TESTS}) ADD_EXECUTABLE(${TEST} ${TEST}.cc) TARGET_LINK_LIBRARIES(${TEST} SDL2pp) - IF(SDL2PP_ENABLE_GUI_TEST) + IF(SDL2PP_ENABLE_LIVE_TESTS) ADD_TEST(${TEST} ${TEST}) - ENDIF(SDL2PP_ENABLE_GUI_TEST) + ENDIF(SDL2PP_ENABLE_LIVE_TESTS) ENDFOREACH(TEST ${TESTS}) diff --git a/tests/gui_rendering.cc b/tests/live_rendering.cc similarity index 100% rename from tests/gui_rendering.cc rename to tests/live_rendering.cc