mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-02 18:24:31 +00:00
TORQUE_TESTS_ENABLED check no longer required
This commit is contained in:
parent
ffc001bb97
commit
d35de7afc0
4 changed files with 2 additions and 13 deletions
|
|
@ -645,6 +645,8 @@ if(TORQUE_TESTING)
|
|||
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 "gfx/D3D11/")
|
||||
list(FILTER TORQUE_TEST_SOURCES EXCLUDE REGEX "gfx/gl/")
|
||||
|
||||
add_executable(${TORQUE_APP_NAME}_unittests
|
||||
${TORQUE_TEST_SOURCES}
|
||||
|
|
@ -667,8 +669,6 @@ if(TORQUE_TESTING)
|
|||
target_compile_definitions(${TORQUE_APP_NAME}_unittests
|
||||
PUBLIC
|
||||
${TORQUE_COMPILE_DEFINITIONS}
|
||||
TORQUE_TESTS_ENABLED
|
||||
"_VARIADIC_MAX=10"
|
||||
TORQUE_SHARED
|
||||
SDL_MAIN_HANDLED
|
||||
)
|
||||
|
|
|
|||
|
|
@ -258,10 +258,6 @@ DXGI_SWAP_CHAIN_DESC GFXD3D11Device::setupPresentParams(const GFXVideoMode &mode
|
|||
|
||||
void GFXD3D11Device::enumerateAdapters(Vector<GFXAdapter*> &adapterList)
|
||||
{
|
||||
#ifdef TORQUE_TESTS_ENABLED
|
||||
return;
|
||||
#endif
|
||||
|
||||
IDXGIAdapter1* EnumAdapter;
|
||||
IDXGIFactory1* DXGIFactory;
|
||||
|
||||
|
|
|
|||
|
|
@ -77,10 +77,6 @@ void EnumerateVideoModes(Vector<GFXVideoMode>& outModes)
|
|||
|
||||
void GFXGLDevice::enumerateAdapters( Vector<GFXAdapter*> &adapterList )
|
||||
{
|
||||
#ifdef TORQUE_TESTS_ENABLED
|
||||
return;
|
||||
#endif
|
||||
|
||||
AssertFatal( SDL_WasInit(SDL_INIT_VIDEO), "");
|
||||
|
||||
PlatformGL::init(); // for hints about context creation
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
// IN THE SOFTWARE.
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifdef TORQUE_TESTS_ENABLED
|
||||
#include "testing/unitTesting.h"
|
||||
#include "core/util/str.h"
|
||||
#include "core/util/tVector.h"
|
||||
|
|
@ -347,5 +346,3 @@ TEST(StringBuilder, StringBuilder)
|
|||
|
||||
EXPECT_TRUE( str.end() == String( "foobarbarfoo" ) );
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue