TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

TORQUE_TESTS_ENABLED check no longer required

Browse source
This commit is contained in:
marauder2k7 2026-05-30 21:08:39 +01:00
parent ffc001bb97
commit d35de7afc0
4 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/CMakeLists.txt
View file

@ -645,6 +645,8 @@ if(TORQUE_TESTING)
list(APPEND TORQUE_TEST_SOURCES ${TORQUE_TEST_FILES}) list(APPEND TORQUE_TEST_SOURCES ${TORQUE_TEST_FILES})
list(FILTER TORQUE_TEST_SOURCES EXCLUDE REGEX "main/main\\.cpp$") list(FILTER TORQUE_TEST_SOURCES EXCLUDE REGEX "main/main\\.cpp$")
list(FILTER TORQUE_TEST_SOURCES EXCLUDE REGEX "gfx/D3D11/")
list(FILTER TORQUE_TEST_SOURCES EXCLUDE REGEX "gfx/gl/")
add_executable(${TORQUE_APP_NAME}_unittests add_executable(${TORQUE_APP_NAME}_unittests
${TORQUE_TEST_SOURCES} ${TORQUE_TEST_SOURCES}
@ -667,8 +669,6 @@ if(TORQUE_TESTING)
target_compile_definitions(${TORQUE_APP_NAME}_unittests target_compile_definitions(${TORQUE_APP_NAME}_unittests
PUBLIC PUBLIC
${TORQUE_COMPILE_DEFINITIONS} ${TORQUE_COMPILE_DEFINITIONS}
TORQUE_TESTS_ENABLED
"_VARIADIC_MAX=10"
TORQUE_SHARED TORQUE_SHARED
SDL_MAIN_HANDLED SDL_MAIN_HANDLED
) )

4
Engine/source/gfx/D3D11/gfxD3D11Device.cpp
View file

@ -258,10 +258,6 @@ DXGI_SWAP_CHAIN_DESC GFXD3D11Device::setupPresentParams(const GFXVideoMode &mode
void GFXD3D11Device::enumerateAdapters(Vector<GFXAdapter*> &adapterList) void GFXD3D11Device::enumerateAdapters(Vector<GFXAdapter*> &adapterList)
{ {
#ifdef TORQUE_TESTS_ENABLED
return;
#endif
IDXGIAdapter1* EnumAdapter; IDXGIAdapter1* EnumAdapter;
IDXGIFactory1* DXGIFactory; IDXGIFactory1* DXGIFactory;

4
Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp
View file

@ -77,10 +77,6 @@ void EnumerateVideoModes(Vector<GFXVideoMode>& outModes)
void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList ) void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
{ {
#ifdef TORQUE_TESTS_ENABLED
return;
#endif
AssertFatal( SDL_WasInit(SDL_INIT_VIDEO), ""); AssertFatal( SDL_WasInit(SDL_INIT_VIDEO), "");
PlatformGL::init(); // for hints about context creation PlatformGL::init(); // for hints about context creation

3
Engine/source/testing/strTest.cpp
View file

@ -20,7 +20,6 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifdef TORQUE_TESTS_ENABLED
#include "testing/unitTesting.h" #include "testing/unitTesting.h"
#include "core/util/str.h" #include "core/util/str.h"
#include "core/util/tVector.h" #include "core/util/tVector.h"
@ -347,5 +346,3 @@ TEST(StringBuilder, StringBuilder)
EXPECT_TRUE( str.end() == String( "foobarbarfoo" ) ); EXPECT_TRUE( str.end() == String( "foobarbarfoo" ) );
} }
#endif