mirror of
https://github.com/libSDL2pp/libSDL2pp.git
synced 2025-09-07 22:36:49 -04:00
Rename gui tests to live tests
This commit is contained in:
parent
b7eb867aa5
commit
f6d781b178
@ -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
|
- 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
|
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
|
||||||
script:
|
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
|
- make && make test && make install
|
||||||
- cppcheck -I . --enable=style,performance,portability,information,missingInclude --error-exitcode=2 SDL2pp
|
- 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"
|
- "if make doxygen 2>&1 | grep 'warning:'; then echo 'FATAL: doxygen warnings!'; false; fi"
|
||||||
|
@ -202,7 +202,7 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
|
|||||||
# examples and tests
|
# examples and tests
|
||||||
OPTION(SDL2PP_WITH_EXAMPLES "Build examples" ON)
|
OPTION(SDL2PP_WITH_EXAMPLES "Build examples" ON)
|
||||||
OPTION(SDL2PP_WITH_TESTS "Build tests" 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)
|
IF(SDL2PP_WITH_EXAMPLES)
|
||||||
ADD_SUBDIRECTORY(examples)
|
ADD_SUBDIRECTORY(examples)
|
||||||
|
@ -6,10 +6,9 @@ SET(CLI_TESTS
|
|||||||
test_error
|
test_error
|
||||||
)
|
)
|
||||||
|
|
||||||
# tests which test graphics functionality and thus requre working
|
# live tests require X11 display and/or audio output
|
||||||
# and OpenGL-enabled X11 display
|
SET(LIVE_TESTS
|
||||||
SET(GUI_TESTS
|
live_rendering
|
||||||
gui_rendering
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# disable self-move warning: it's deliberately used in tests
|
# disable self-move warning: it's deliberately used in tests
|
||||||
@ -36,10 +35,10 @@ FOREACH(TEST ${CLI_TESTS})
|
|||||||
ADD_TEST(${TEST} ${TEST})
|
ADD_TEST(${TEST} ${TEST})
|
||||||
ENDFOREACH(TEST ${TESTS})
|
ENDFOREACH(TEST ${TESTS})
|
||||||
|
|
||||||
FOREACH(TEST ${GUI_TESTS})
|
FOREACH(TEST ${LIVE_TESTS})
|
||||||
ADD_EXECUTABLE(${TEST} ${TEST}.cc)
|
ADD_EXECUTABLE(${TEST} ${TEST}.cc)
|
||||||
TARGET_LINK_LIBRARIES(${TEST} SDL2pp)
|
TARGET_LINK_LIBRARIES(${TEST} SDL2pp)
|
||||||
IF(SDL2PP_ENABLE_GUI_TEST)
|
IF(SDL2PP_ENABLE_LIVE_TESTS)
|
||||||
ADD_TEST(${TEST} ${TEST})
|
ADD_TEST(${TEST} ${TEST})
|
||||||
ENDIF(SDL2PP_ENABLE_GUI_TEST)
|
ENDIF(SDL2PP_ENABLE_LIVE_TESTS)
|
||||||
ENDFOREACH(TEST ${TESTS})
|
ENDFOREACH(TEST ${TESTS})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user