Skip to content

Commit 00c0170

Browse files
committed
TORQUE_TESTS_ENABLED check no longer required
1 parent bbeeba6 commit 00c0170

4 files changed

Lines changed: 2 additions & 13 deletions

File tree

Engine/source/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,8 @@ if(TORQUE_TESTING)
645645
list(APPEND TORQUE_TEST_SOURCES ${TORQUE_TEST_FILES})
646646

647647
list(FILTER TORQUE_TEST_SOURCES EXCLUDE REGEX "main/main\\.cpp$")
648+
list(FILTER TORQUE_TEST_SOURCES EXCLUDE REGEX "gfx/D3D11/")
649+
list(FILTER TORQUE_TEST_SOURCES EXCLUDE REGEX "gfx/gl/")
648650

649651
add_executable(${TORQUE_APP_NAME}_unittests
650652
${TORQUE_TEST_SOURCES}
@@ -667,8 +669,6 @@ if(TORQUE_TESTING)
667669
target_compile_definitions(${TORQUE_APP_NAME}_unittests
668670
PUBLIC
669671
${TORQUE_COMPILE_DEFINITIONS}
670-
TORQUE_TESTS_ENABLED
671-
"_VARIADIC_MAX=10"
672672
TORQUE_SHARED
673673
SDL_MAIN_HANDLED
674674
)

Engine/source/gfx/D3D11/gfxD3D11Device.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,6 @@ DXGI_SWAP_CHAIN_DESC GFXD3D11Device::setupPresentParams(const GFXVideoMode &mode
258258

259259
void GFXD3D11Device::enumerateAdapters(Vector<GFXAdapter*> &adapterList)
260260
{
261-
#ifdef TORQUE_TESTS_ENABLED
262-
return;
263-
#endif
264-
265261
IDXGIAdapter1* EnumAdapter;
266262
IDXGIFactory1* DXGIFactory;
267263

Engine/source/gfx/gl/sdl/gfxGLDevice.sdl.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ void EnumerateVideoModes(Vector<GFXVideoMode>& outModes)
7777

7878
void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
7979
{
80-
#ifdef TORQUE_TESTS_ENABLED
81-
return;
82-
#endif
83-
8480
AssertFatal( SDL_WasInit(SDL_INIT_VIDEO), "");
8581

8682
PlatformGL::init(); // for hints about context creation

Engine/source/testing/strTest.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
// IN THE SOFTWARE.
2121
//-----------------------------------------------------------------------------
2222

23-
#ifdef TORQUE_TESTS_ENABLED
2423
#include "testing/unitTesting.h"
2524
#include "core/util/str.h"
2625
#include "core/util/tVector.h"
@@ -347,5 +346,3 @@ TEST(StringBuilder, StringBuilder)
347346

348347
EXPECT_TRUE( str.end() == String( "foobarbarfoo" ) );
349348
}
350-
351-
#endif

0 commit comments

Comments
 (0)