Commit 7d2808e30b1405b91eb92439cadee6ab25dc9bfc
2022-04-12T13:33:58
test: Run selected noninteractive tests at build-time In Autotools, these are run by `make -C ${builddir}/test check`. In CMake, they're run by `make -C ${builddir} test` or `ninja -C ${builddir} test` or `ctest --test-dir ${builddir}`. Signed-off-by: Simon McVittie <smcv@collabora.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca85714..5c695de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2980,6 +2980,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSDL_BUILD_MICRO_VERSION=${SDL_MICRO_VERSIO
##### Tests #####
if(SDL_TEST)
+ include(CTest)
include_directories(BEFORE "${SDL2_BINARY_DIR}/include")
include_directories(AFTER "${SDL2_SOURCE_DIR}/include")
file(GLOB TEST_SOURCES ${SDL2_SOURCE_DIR}/src/test/*.c)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index cd00af6..03e0096 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 3.0.0)
project(SDL2 C)
+include(CTest)
# Global settings for all of the test targets
# FIXME: is this wrong?
@@ -133,6 +134,34 @@ add_executable(controllermap controllermap.c)
add_executable(testvulkan testvulkan.c)
add_executable(testoffscreen testoffscreen.c)
+set(NONINTERACTIVE
+ testatomic
+ testerror
+ testfilesystem
+ testkeys
+ testlocale
+ testplatform
+ testpower
+ testqsort
+ testthread
+ testtimer
+ testver
+)
+
+if(LINUX)
+ list(APPEND NONINTERACTIVE testevdev)
+endif()
+
+set(NEEDS_AUDIO
+ testaudioinfo
+ testsurround
+)
+
+set(NEEDS_DISPLAY
+ testbounds
+ testdisplayinfo
+)
+
if(OPENGL_FOUND)
add_dependencies(testshader OpenGL::GL)
add_dependencies(testgl2 OpenGL::GL)
@@ -306,3 +335,20 @@ if(APPLE)
endforeach()
endif()
endif()
+
+set(TESTS_ENVIRONMENT
+ SDL_AUDIODRIVER=dummy
+ SDL_VIDEODRIVER=dummy
+)
+
+foreach(TESTCASE ${NONINTERACTIVE} ${NEEDS_AUDIO} ${NEEDS_DISPLAY})
+ add_test(
+ NAME ${TESTCASE}
+ COMMAND ${TESTCASE}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ set_tests_properties(
+ ${TESTCASE}
+ PROPERTIES ENVIRONMENT "${TESTS_ENVIRONMENT}"
+ )
+endforeach()
diff --git a/test/Makefile.in b/test/Makefile.in
index f724618..120e585 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -351,6 +351,49 @@ distclean: clean
rm -f config.status config.cache config.log
rm -rf $(srcdir)/autom4te*
+noninteractive = \
+ testatomic$(EXE) \
+ testerror$(EXE) \
+ testevdev$(EXE) \
+ testfilesystem$(EXE) \
+ testkeys$(EXE) \
+ testlocale$(EXE) \
+ testplatform$(EXE) \
+ testpower$(EXE) \
+ testqsort$(EXE) \
+ testthread$(EXE) \
+ testtimer$(EXE) \
+ testver$(EXE) \
+ $(NULL)
+
+needs_audio = \
+ testaudioinfo$(EXE) \
+ testsurround$(EXE) \
+ $(NULL)
+
+needs_display = \
+ testbounds$(EXE) \
+ testdisplayinfo$(EXE) \
+ $(NULL)
+
+TESTS = $(noninteractive) $(needs_audio) $(needs_display)
+
+check:
+ @set -e; \
+ status=0; \
+ export SDL_AUDIODRIVER=dummy; \
+ export SDL_VIDEODRIVER=dummy; \
+ for exe in $(TESTS); do \
+ echo "$$exe..."; \
+ if ./"$$exe"; then \
+ echo "$$exe: OK"; \
+ else \
+ echo "$$exe: FAILED: $$?"; \
+ status=1; \
+ fi; \
+ done; \
+ exit "$$status"
+
DATA = \
axis.bmp \
button.bmp \