move cmake files back into tests subdirectory

.github/workflows/main.yml

@@ -19,6 +19,7 @@ jobs:
         - uses: seanmiddleditch/gha-setup-ninja@master
         - name: test_macos
           run: |
+            cd tests
             ./tests/test_macos.sh
     ios:
         runs-on: macos-latest
@@ -26,6 +27,7 @@ jobs:
         - uses: actions/checkout@v2
         - name: test_ios
           run: |
+            cd tests
             ./tests/test_ios.sh
     linux:
         runs-on: ubuntu-latest
@@ -38,6 +40,7 @@ jobs:
             sudo apt-get install libgl1-mesa-dev libegl1-mesa-dev mesa-common-dev xorg-dev libasound-dev
         - name: test_linux
           run: |
+            cd tests
             ./tests/test_linux.sh
     emscripten:
         runs-on: ubuntu-latest
@@ -46,6 +49,7 @@ jobs:
         - uses: seanmiddleditch/gha-setup-ninja@master
         - name: test_emscripten
           run: |
+            cd tests
             ./tests/test_emscripten.sh
     android:
         runs-on: ubuntu-latest
@@ -57,6 +61,7 @@ jobs:
             java-version: '8'
         - name: test_android
           run: |
+            cd tests
             ./tests/test_android.sh
     #uwp:
     #    runs-on: windows-latest

CMakeLists.txt

@@ -1,156 +0,0 @@
-#
-# NOTE: this CMakeLists.txt file is only required for building the tests!
-#
-cmake_minimum_required(VERSION 3.20)
-project(sokol-test)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 17)  # needed for UWP
-
-# SOKOL_GLCORE33, SOKOL_GLES2, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU, SOKOL_DUMMY
-set(SOKOL_BACKEND "SOKOL_DUMMY_BACKEND" CACHE STRING "Select 3D backend API")
-set_property(CACHE SOKOL_BACKEND PROPERTY STRINGS SOKOL_GLCORE33 SOKOL_METAL SOKOL_D3D11 SOKOL_DUMMY_BACKEND)
-option(SOKOL_FORCE_EGL "Force EGL with GLCORE33 backend" OFF)
-option(USE_ARC "Enable/disable ARC" OFF)
-option(USE_ANALYZER "Enable/disable clang analyzer" OFF)
-
-if (CMAKE_SYSTEM_NAME STREQUAL Emscripten)
-    set(EMSCRIPTEN 1)
-elseif (CMAKE_SYSTEM_NAME STREQUAL iOS)
-    set(OSX_IOS 1)
-elseif (CMAKE_SYSTEM_NAME STREQUAL Android)
-    set(ANDROID 1)
-elseif (CMAKE_SYSTEM_NAME STREQUAL Linux)
-    set(LINUX 1)
-elseif (CMAKE_SYSTEM_NAME STREQUAL Darwin)
-    set(OSX_MACOS 1)
-elseif (CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
-    set(UWP 1)
-elseif (CMAKE_SYSTEM_NAME STREQUAL Windows)
-    set(WINDOWS 1)
-else()
-    message(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_NAME")
-endif()
-
-message(">> CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
-message(">> SOKOL_BACKEND: ${SOKOL_BACKEND}")
-message(">> SOKOL_FORCE_EGL: ${SOKOL_FORCE_EGL}")
-if (OSX_IOS OR OSX_MACOS)
-    if (USE_ARC)
-        message(">> ObjC ARC ENABLED")
-    else()
-        message(">> ObjC ARC DISABLED")
-    endif()
-endif()
-message(">> BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-message(">> TOOLCHAIN: ${CMAKE_TOOLCHAIN_FILE}")
-
-set(c_flags)
-set(cxx_flags)
-set(link_flags)
-set(system_libs)
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    set(c_flags ${c_flags} /W4 /WX /D_CRT_SECURE_NO_WARNINGS)
-    set(cxx_flags ${cxx_flags} /W4 /WX /EHsc /D_CRT_SECURE_NO_WARNINGS)
-else()
-    set(c_flags ${c_flags} -Wall -Wextra -Werror -Wsign-conversion)
-    set(cxx_flags ${cxx_flags} -Wall -Wextra -Werror -Wsign-conversion -fno-rtti -fno-exceptions)
-    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-        set(c_flags ${c_flags} -Wno-missing-field-initializers)
-        set(cxx_flags ${cxx_flags} -Wno-missing-field-initializers)
-    endif()
-    if (USE_ANALYZER)
-        # FIXME: consider using clang-tidy via CMAKE_CXX_CLANG_TIDY: https://ortogonal.github.io/cmake-clang-tidy/
-        # with the default settings this spams the output with irrelevant C++ coding style warnings in 3rd party libs though
-        message(">> Configuring for static code analysis")
-        set(c_flags ${c_flags} --analyze -Xanalyzer -analyzer-opt-analyze-headers)
-        set(cxx_flags ${cxx_flags} --analyze -Xanalyzer -analyzer-opt-analyze-headers)
-        set(link_flags ${link_flags} --analyze -Wno-unused-command-line-argument)
-    endif()
-endif()
-
-if (EMSCRIPTEN)
-    set(CMAKE_EXECUTABLE_SUFFIX ".html")
-    set(link_flags ${link-flags} -sNO_FILESYSTEM=1 -sASSERTIONS=0 -sMALLOC=emmalloc -sINITIAL_MEMORY=33554432 --closure=1)
-elseif (OSX_IOS)
-    set(exe_type MACOSX_BUNDLE)
-    if (USE_ARC)
-        set(c_flags ${c_flags} -fobjc-arc)
-        set(cxx_flags ${cxx_flags} -fobjc-arc)
-    endif()
-    set(system_libs ${system_libs} "-framework Foundation" "-framework UIKit" "-framework AudioToolbox" "-framework AVFoundation")
-    if (SOKOL_BACKEND STREQUAL SOKOL_METAL)
-        set(system_libs ${system_libs} "-framework Metal" "-framework MetalKit")
-    else()
-        set(system_libs ${system_libs} "-framework OpenGLES" "-framework GLKit")
-    endif()
-elseif (ANDROID)
-    set(system_libs ${system_libs} GLESv3 EGL OpenSLES log android)
-    # FIXME
-elseif (LINUX)
-    set(THREADS_PREFER_PTHREAD_FLAG ON)
-    find_package(Threads REQUIRED)
-    if ((SOKOL_BACKEND STREQUAL SOKOL_GLES3) OR SOKOL_FORCE_EGL)
-        set(system_libs ${system_libs} X11 Xi Xcursor EGL GL asound dl m Threads::Threads)
-    else()
-        set(system_libs ${system_libs} X11 Xi Xcursor GL asound dl m Threads::Threads)
-    endif()
-elseif (OSX_MACOS)
-    set(exe_type MACOSX_BUNDLE)
-    if (USE_ARC)
-        set(c_flags ${c_flags} -fobjc-arc)
-        set(cxx_flags ${cxx_flags} -fobjc-arc)
-    endif()
-    set(system_libs ${system_libs} "-framework QuartzCore" "-framework Cocoa" "-framework AudioToolbox")
-    if (SOKOL_BACKEND STREQUAL SOKOL_METAL)
-        set(system_libs ${system_libs} "-framework MetalKit" "-framework Metal")
-    else()
-        set(system_libs ${system_libs} "-framework OpenGL")
-    endif()
-elseif (UWP)
-    set(exe_type WIN32)
-elseif (WINDOWS)
-    set(exe_type WIN32)
-endif()
-
-macro(configure_common target)
-    if (SOKOL_FORCE_EGL)
-        target_compile_definitions(${target} PRIVATE SOKOL_FORCE_EGL)
-    endif()
-    target_compile_definitions(${target} PRIVATE ${SOKOL_BACKEND})
-    target_link_options(${target} PRIVATE ${link_flags})
-    target_link_libraries(${target} PRIVATE ${system_libs})
-    target_include_directories(${target} PRIVATE ../.. ../../util)
-    target_include_directories(${target} PRIVATE ../ext)
-endmacro()
-
-macro(configure_osx_properties target)
-    if (OSX_IOS)
-        target_compile_definitions(${target} PRIVATE GLES_SILENCE_DEPRECATION)
-    endif()
-    set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${target}")
-    set_target_properties(${target} PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "${target}")
-    set_target_properties(${target} PROPERTIES MACOSX_BUNDLE_PRODUCT_NAME "${target}")
-    set_target_properties(${target} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "${target}")
-endmacro()
-
-macro(configure_c target)
-    configure_common(${target})
-    target_compile_options(${target} PRIVATE ${c_flags})
-    if (OSX_MACOS OR OSX_IOS)
-        target_compile_options(${target} PRIVATE -x objective-c)
-        configure_osx_properties(${target})
-    endif()
-endmacro()
-
-macro(configure_cxx target)
-    configure_common(${target})
-    target_compile_options(${target} PRIVATE ${cxx_flags})
-    if (OSX_MACOS OR OSX_IOS)
-        target_compile_options(${target} PRIVATE -x objective-c++)
-        configure_osx_properties(${target})
-    endif()
-endmacro()
-
-add_subdirectory(tests)

tests/CMakeLists.txt

@@ -1,3 +1,155 @@
+cmake_minimum_required(VERSION 3.20)
+project(sokol-test)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)  # needed for UWP
+
+# SOKOL_GLCORE33, SOKOL_GLES2, SOKOL_GLES3, SOKOL_D3D11, SOKOL_METAL, SOKOL_WGPU, SOKOL_DUMMY
+set(SOKOL_BACKEND "SOKOL_DUMMY_BACKEND" CACHE STRING "Select 3D backend API")
+set_property(CACHE SOKOL_BACKEND PROPERTY STRINGS SOKOL_GLCORE33 SOKOL_METAL SOKOL_D3D11 SOKOL_DUMMY_BACKEND)
+option(SOKOL_FORCE_EGL "Force EGL with GLCORE33 backend" OFF)
+option(USE_ARC "Enable/disable ARC" OFF)
+option(USE_ANALYZER "Enable/disable clang analyzer" OFF)
+
+if (CMAKE_SYSTEM_NAME STREQUAL Emscripten)
+    set(EMSCRIPTEN 1)
+elseif (CMAKE_SYSTEM_NAME STREQUAL iOS)
+    set(OSX_IOS 1)
+elseif (CMAKE_SYSTEM_NAME STREQUAL Android)
+    set(ANDROID 1)
+elseif (CMAKE_SYSTEM_NAME STREQUAL Linux)
+    set(LINUX 1)
+elseif (CMAKE_SYSTEM_NAME STREQUAL Darwin)
+    set(OSX_MACOS 1)
+elseif (CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+    set(UWP 1)
+elseif (CMAKE_SYSTEM_NAME STREQUAL Windows)
+    set(WINDOWS 1)
+else()
+    message(FATAL_ERROR "Unrecognized CMAKE_SYSTEM_NAME")
+endif()
+
+message(">> CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
+message(">> SOKOL_BACKEND: ${SOKOL_BACKEND}")
+message(">> SOKOL_FORCE_EGL: ${SOKOL_FORCE_EGL}")
+if (OSX_IOS OR OSX_MACOS)
+    if (USE_ARC)
+        message(">> ObjC ARC ENABLED")
+    else()
+        message(">> ObjC ARC DISABLED")
+    endif()
+endif()
+message(">> BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+message(">> TOOLCHAIN: ${CMAKE_TOOLCHAIN_FILE}")
+
+set(c_flags)
+set(cxx_flags)
+set(link_flags)
+set(system_libs)
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    set(c_flags ${c_flags} /W4 /WX /D_CRT_SECURE_NO_WARNINGS)
+    set(cxx_flags ${cxx_flags} /W4 /WX /EHsc /D_CRT_SECURE_NO_WARNINGS)
+else()
+    set(c_flags ${c_flags} -Wall -Wextra -Werror -Wsign-conversion)
+    set(cxx_flags ${cxx_flags} -Wall -Wextra -Werror -Wsign-conversion -fno-rtti -fno-exceptions)
+    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        set(c_flags ${c_flags} -Wno-missing-field-initializers)
+        set(cxx_flags ${cxx_flags} -Wno-missing-field-initializers)
+    endif()
+    if (USE_ANALYZER)
+        # FIXME: consider using clang-tidy via CMAKE_CXX_CLANG_TIDY: https://ortogonal.github.io/cmake-clang-tidy/
+        # with the default settings this spams the output with irrelevant C++ coding style warnings in 3rd party libs though
+        message(">> Configuring for static code analysis")
+        set(c_flags ${c_flags} --analyze -Xanalyzer -analyzer-opt-analyze-headers)
+        set(cxx_flags ${cxx_flags} --analyze -Xanalyzer -analyzer-opt-analyze-headers)
+        set(link_flags ${link_flags} --analyze -Wno-unused-command-line-argument)
+    endif()
+endif()
+
+if (EMSCRIPTEN)
+    set(CMAKE_EXECUTABLE_SUFFIX ".html")
+    set(link_flags ${link-flags} -sNO_FILESYSTEM=1 -sASSERTIONS=0 -sMALLOC=emmalloc -sINITIAL_MEMORY=33554432 --closure=1)
+elseif (OSX_IOS)
+    set(exe_type MACOSX_BUNDLE)
+    if (USE_ARC)
+        set(c_flags ${c_flags} -fobjc-arc)
+        set(cxx_flags ${cxx_flags} -fobjc-arc)
+    endif()
+    set(system_libs ${system_libs} "-framework Foundation" "-framework UIKit" "-framework AudioToolbox" "-framework AVFoundation")
+    if (SOKOL_BACKEND STREQUAL SOKOL_METAL)
+        set(system_libs ${system_libs} "-framework Metal" "-framework MetalKit")
+    else()
+        set(system_libs ${system_libs} "-framework OpenGLES" "-framework GLKit")
+    endif()
+elseif (ANDROID)
+    set(system_libs ${system_libs} GLESv3 EGL OpenSLES log android)
+    # FIXME
+elseif (LINUX)
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
+    find_package(Threads REQUIRED)
+    if ((SOKOL_BACKEND STREQUAL SOKOL_GLES3) OR SOKOL_FORCE_EGL)
+        set(system_libs ${system_libs} X11 Xi Xcursor EGL GL asound dl m Threads::Threads)
+    else()
+        set(system_libs ${system_libs} X11 Xi Xcursor GL asound dl m Threads::Threads)
+    endif()
+elseif (OSX_MACOS)
+    set(exe_type MACOSX_BUNDLE)
+    if (USE_ARC)
+        set(c_flags ${c_flags} -fobjc-arc)
+        set(cxx_flags ${cxx_flags} -fobjc-arc)
+    endif()
+    set(system_libs ${system_libs} "-framework QuartzCore" "-framework Cocoa" "-framework AudioToolbox")
+    if (SOKOL_BACKEND STREQUAL SOKOL_METAL)
+        set(system_libs ${system_libs} "-framework MetalKit" "-framework Metal")
+    else()
+        set(system_libs ${system_libs} "-framework OpenGL")
+    endif()
+elseif (UWP)
+    set(exe_type WIN32)
+elseif (WINDOWS)
+    set(exe_type WIN32)
+endif()
+
+macro(configure_common target)
+    if (SOKOL_FORCE_EGL)
+        target_compile_definitions(${target} PRIVATE SOKOL_FORCE_EGL)
+    endif()
+    target_compile_definitions(${target} PRIVATE ${SOKOL_BACKEND})
+    target_link_options(${target} PRIVATE ${link_flags})
+    target_link_libraries(${target} PRIVATE ${system_libs})
+    target_include_directories(${target} PRIVATE ../.. ../../util)
+    target_include_directories(${target} PRIVATE ../ext)
+endmacro()
+
+macro(configure_osx_properties target)
+    if (OSX_IOS)
+        target_compile_definitions(${target} PRIVATE GLES_SILENCE_DEPRECATION)
+    endif()
+    set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${target}")
+    set_target_properties(${target} PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "${target}")
+    set_target_properties(${target} PROPERTIES MACOSX_BUNDLE_PRODUCT_NAME "${target}")
+    set_target_properties(${target} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "${target}")
+endmacro()
+
+macro(configure_c target)
+    configure_common(${target})
+    target_compile_options(${target} PRIVATE ${c_flags})
+    if (OSX_MACOS OR OSX_IOS)
+        target_compile_options(${target} PRIVATE -x objective-c)
+        configure_osx_properties(${target})
+    endif()
+endmacro()
+
+macro(configure_cxx target)
+    configure_common(${target})
+    target_compile_options(${target} PRIVATE ${cxx_flags})
+    if (OSX_MACOS OR OSX_IOS)
+        target_compile_options(${target} PRIVATE -x objective-c++)
+        configure_osx_properties(${target})
+    endif()
+endmacro()
+
 add_subdirectory(ext)
-add_subdirectory(functional)
 add_subdirectory(compile)
+add_subdirectory(functional)

CMakePresets.json → tests/CMakePresets.json

@@ -9,7 +9,7 @@
         {
             "name": "macos_gl_debug",
             "generator": "Ninja",
-            "binaryDir": "tests/build/macos_gl_debug",
+            "binaryDir": "build/macos_gl_debug",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLCORE33",
                 "CMAKE_BUILD_TYPE": "Debug"
@@ -18,7 +18,7 @@
         {
             "name": "macos_gl_release",
             "generator": "Ninja",
-            "binaryDir": "tests/build/macos_gl_release",
+            "binaryDir": "build/macos_gl_release",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLCORE33",
                 "CMAKE_BUILD_TYPE": "Release"
@@ -27,7 +27,7 @@
         {
             "name": "macos_metal_debug",
             "generator": "Ninja",
-            "binaryDir": "tests/build/macos_metal_debug",
+            "binaryDir": "build/macos_metal_debug",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_METAL",
                 "CMAKE_BUILD_TYPE": "Debug"
@@ -36,7 +36,7 @@
         {
             "name": "macos_metal_release",
             "generator": "Ninja",
-            "binaryDir": "tests/build/macos_metal_release",
+            "binaryDir": "build/macos_metal_release",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_METAL",
                 "CMAKE_BUILD_TYPE": "Release"
@@ -45,7 +45,7 @@
         {
             "name": "macos_arc_gl_debug",
             "generator": "Ninja",
-            "binaryDir": "tests/build/macos_arc_gl_debug",
+            "binaryDir": "build/macos_arc_gl_debug",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLCORE33",
                 "USE_ARC": {
@@ -58,7 +58,7 @@
         {
             "name": "macos_arc_gl_release",
             "generator": "Ninja",
-            "binaryDir": "tests/build/macos_arc_gl_release",
+            "binaryDir": "build/macos_arc_gl_release",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLCORE33",
                 "USE_ARC": {
@@ -71,7 +71,7 @@
         {
             "name": "macos_arc_metal_debug",
             "generator": "Ninja",
-            "binaryDir": "tests/build/macos_arc_metal_debug",
+            "binaryDir": "build/macos_arc_metal_debug",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_METAL",
                 "USE_ARC": {
@@ -84,7 +84,7 @@
         {
             "name": "macos_arc_metal_release",
             "generator": "Ninja",
-            "binaryDir": "tests/build/macos_arc_metal_release",
+            "binaryDir": "build/macos_arc_metal_release",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_METAL",
                 "USE_ARC": {
@@ -97,7 +97,7 @@
         {
             "name": "ios_gl",
             "generator": "Xcode",
-            "binaryDir": "tests/build/ios_gl",
+            "binaryDir": "build/ios_gl",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "CMAKE_SYSTEM_NAME": "iOS"
@@ -106,7 +106,7 @@
         {
             "name": "ios_metal",
             "generator": "Xcode",
-            "binaryDir": "tests/build/ios_metal",
+            "binaryDir": "build/ios_metal",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_METAL",
                 "CMAKE_SYSTEM_NAME": "iOS"
@@ -115,7 +115,7 @@
         {
             "name": "ios_arc_gl",
             "generator": "Xcode",
-            "binaryDir": "tests/build/ios_arc_gl",
+            "binaryDir": "build/ios_arc_gl",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "USE_ARC": {
@@ -128,7 +128,7 @@
         {
             "name": "ios_arc_metal",
             "generator": "Xcode",
-            "binaryDir": "tests/build/ios_arc_metal",
+            "binaryDir": "build/ios_arc_metal",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_METAL",
                 "USE_ARC": {
@@ -141,7 +141,7 @@
         {
             "name": "linux_gl_debug",
             "generator": "Ninja",
-            "binaryDir": "tests/build/linux_gl_debug",
+            "binaryDir": "build/linux_gl_debug",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLCORE33",
                 "CMAKE_BUILD_TYPE": "Debug"
@@ -150,7 +150,7 @@
         {
             "name": "linux_gl_release",
             "generator": "Ninja",
-            "binaryDir": "tests/build/linux_gl_release",
+            "binaryDir": "build/linux_gl_release",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLCORE33",
                 "CMAKE_BUILD_TYPE": "Release"
@@ -159,7 +159,7 @@
         {
             "name": "linux_gles3_debug",
             "generator": "Ninja",
-            "binaryDir": "tests/build/linux_gles3_debug",
+            "binaryDir": "build/linux_gles3_debug",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "CMAKE_BUILD_TYPE": "Debug"
@@ -168,7 +168,7 @@
         {
             "name": "linux_gles3_release",
             "generator": "Ninja",
-            "binaryDir": "tests/build/linux_gles3_release",
+            "binaryDir": "build/linux_gles3_release",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "CMAKE_BUILD_TYPE": "Release"
@@ -177,7 +177,7 @@
         {
             "name": "linux_gl_egl_debug",
             "generator": "Ninja",
-            "binaryDir": "tests/build/linux_gl_egl_debug",
+            "binaryDir": "build/linux_gl_egl_debug",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLCORE33",
                 "SOKOL_FORCE_EGL": {
@@ -190,7 +190,7 @@
         {
             "name": "linux_gl_egl_release",
             "generator": "Ninja",
-            "binaryDir": "tests/build/linux_gl_egl_release",
+            "binaryDir": "build/linux_gl_egl_release",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLCORE33",
                 "SOKOL_FORCE_EGL": {
@@ -203,8 +203,8 @@
         {
             "name": "emsc_webgl2_debug",
             "generator": "Ninja",
-            "binaryDir": "tests/build/emsc_webgl2_debug",
-            "toolchainFile": "tests/build/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
+            "binaryDir": "build/emsc_webgl2_debug",
+            "toolchainFile": "build/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "CMAKE_BUILD_TYPE": "Debug"
@@ -213,8 +213,8 @@
         {
             "name": "emsc_webgl2_release",
             "generator": "Ninja",
-            "binaryDir": "tests/build/emsc_webgl2_release",
-            "toolchainFile": "tests/build/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
+            "binaryDir": "build/emsc_webgl2_release",
+            "toolchainFile": "build/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "CMAKE_BUILD_TYPE": "Release"
@@ -223,8 +223,8 @@
         {
             "name": "emsc_webgl1_debug",
             "generator": "Ninja",
-            "binaryDir": "tests/build/emsc_webgl1_debug",
-            "toolchainFile": "tests/build/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
+            "binaryDir": "build/emsc_webgl1_debug",
+            "toolchainFile": "build/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES2",
                 "CMAKE_BUILD_TYPE": "Debug"
@@ -233,8 +233,8 @@
         {
             "name": "emsc_webgl1_release",
             "generator": "Ninja",
-            "binaryDir": "tests/build/emsc_webgl1_release",
-            "toolchainFile": "tests/build/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
+            "binaryDir": "build/emsc_webgl1_release",
+            "toolchainFile": "build/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES2",
                 "CMAKE_BUILD_TYPE": "Release"
@@ -243,8 +243,8 @@
         {
             "name": "android_debug",
             "generator": "Ninja",
-            "binaryDir": "tests/build/android_debug",
-            "toolchainFile": "tests/build/android_sdk/ndk-bundle/build/cmake/android.toolchain.cmake",
+            "binaryDir": "build/android_debug",
+            "toolchainFile": "build/android_sdk/ndk-bundle/build/cmake/android.toolchain.cmake",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "ANDROID_ABI": "armeabi-v7a",
@@ -255,8 +255,8 @@
         {
             "name": "android_release",
             "generator": "Ninja",
-            "binaryDir": "tests/build/android_release",
-            "toolchainFile": "tests/build/android_sdk/ndk-bundle/build/cmake/android.toolchain.cmake",
+            "binaryDir": "build/android_release",
+            "toolchainFile": "build/android_sdk/ndk-bundle/build/cmake/android.toolchain.cmake",
             "cacheVariables": {
                 "SOKOL_BACKEND": "SOKOL_GLES3",
                 "ANDROID_ABI": "armeabi-v7a",

tests/test_android.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -e
-source tests/test_common.sh
+source test_common.sh
 setup_android
 build android_debug android_debug
 build android_release android_release

tests/test_common.sh

@@ -1,18 +1,18 @@
 setup_emsdk() {
-    if [ ! -d "tests/build/emsdk" ] ; then
-        mkdir -p tests/build && cd tests/build
+    if [ ! -d "build/emsdk" ] ; then
+        mkdir -p build && cd build
         git clone https://github.com/emscripten-core/emsdk.git
         cd emsdk
         ./emsdk install latest
         ./emsdk activate latest
         cd ../../..
     fi
-    source tests/build/emsdk/emsdk_env.sh
+    source build/emsdk/emsdk_env.sh
 }
 
 setup_android() {
-    if [ ! -d "tests/build/android_sdk" ] ; then
-        mkdir -p tests/build/android_sdk && cd tests/build/android_sdk
+    if [ ! -d "build/android_sdk" ] ; then
+        mkdir -p build/android_sdk && cd build/android_sdk
         sdk_file="sdk-tools-linux-3859397.zip"
         wget --no-verbose https://dl.google.com/android/repository/$sdk_file
         unzip -q $sdk_file
@@ -64,7 +64,7 @@ analyze_ios() {
 
 runtest() {
     cfg=$1
-    cd tests/build/$cfg
+    cd build/$cfg
     ./sokol-test
     cd ../../..
 }

tests/test_emscripten.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -e
-source tests/test_common.sh
+source test_common.sh
 setup_emsdk
 build emsc_webgl2_debug emsc_webgl2_debug
 build emsc_webgl2_release emsc_webgl2_release

tests/test_ios.sh

@@ -1,5 +1,5 @@
 set -e
-source tests/test_common.sh
+source test_common.sh
 build ios_gl ios_gl_debug
 build ios_gl ios_gl_release
 build ios_metal ios_metal_debug

tests/test_linux.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -e
-source tests/test_common.sh
+source test_common.sh
 build linux_gl_debug linux_gl_debug
 build linux_gl_release linux_gl_release
 build linux_gles3_debug linux_gles3_debug

tests/test_macos.sh

@@ -1,5 +1,5 @@
 set -e
-source tests/test_common.sh
+source test_common.sh
 build macos_gl_debug macos_gl_debug
 build macos_gl_release macos_gl_release
 build macos_metal_debug macos_metal_debug