Rename gui tests to live tests

This commit is contained in:
Dmitry Marakasov 2015-09-07 01:58:50 +03:00
parent b7eb867aa5
commit f6d781b178
4 changed files with 8 additions and 9 deletions

View File

@ -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"

View File

@ -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)

View File

@ -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})