early-access version 1617
This commit is contained in:
6
externals/SDL/src/test/SDL_test_assert.c
vendored
6
externals/SDL/src/test/SDL_test_assert.c
vendored
@@ -36,10 +36,10 @@
|
||||
#define SDLTEST_ASSERT_SUMMARY_FORMAT "Assert Summary: Total=%d Passed=%d Failed=%d"
|
||||
|
||||
/* ! \brief counts the failed asserts */
|
||||
static Uint32 SDLTest_AssertsFailed = 0;
|
||||
static int SDLTest_AssertsFailed = 0;
|
||||
|
||||
/* ! \brief counts the passed asserts */
|
||||
static Uint32 SDLTest_AssertsPassed = 0;
|
||||
static int SDLTest_AssertsPassed = 0;
|
||||
|
||||
/*
|
||||
* Assert that logs and break execution flow on failures (i.e. for harness errors).
|
||||
@@ -122,7 +122,7 @@ void SDLTest_ResetAssertSummary()
|
||||
*/
|
||||
void SDLTest_LogAssertSummary()
|
||||
{
|
||||
Uint32 totalAsserts = SDLTest_AssertsPassed + SDLTest_AssertsFailed;
|
||||
int totalAsserts = SDLTest_AssertsPassed + SDLTest_AssertsFailed;
|
||||
if (SDLTest_AssertsFailed == 0)
|
||||
{
|
||||
SDLTest_Log(SDLTEST_ASSERT_SUMMARY_FORMAT, totalAsserts, SDLTest_AssertsPassed, SDLTest_AssertsFailed);
|
||||
|
10
externals/SDL/src/test/SDL_test_common.c
vendored
10
externals/SDL/src/test/SDL_test_common.c
vendored
@@ -1027,10 +1027,12 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
|
||||
}
|
||||
for (i = 0; i < state->num_windows; ++i) {
|
||||
char title[1024];
|
||||
SDL_Rect r = {
|
||||
state->window_x, state->window_y,
|
||||
state->window_w, state->window_h
|
||||
};
|
||||
SDL_Rect r;
|
||||
|
||||
r.x = state->window_x;
|
||||
r.y = state->window_y;
|
||||
r.w = state->window_w;
|
||||
r.h = state->window_h;
|
||||
|
||||
/* !!! FIXME: hack to make --usable-bounds work for now. */
|
||||
if ((r.x == -1) && (r.y == -1) && (r.w == -1) && (r.h == -1)) {
|
||||
|
14
externals/SDL/src/test/SDL_test_harness.c
vendored
14
externals/SDL/src/test/SDL_test_harness.c
vendored
@@ -394,13 +394,13 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user
|
||||
SDL_bool forceTestRun = SDL_FALSE;
|
||||
int testResult = 0;
|
||||
int runResult = 0;
|
||||
Uint32 totalTestFailedCount = 0;
|
||||
Uint32 totalTestPassedCount = 0;
|
||||
Uint32 totalTestSkippedCount = 0;
|
||||
Uint32 testFailedCount = 0;
|
||||
Uint32 testPassedCount = 0;
|
||||
Uint32 testSkippedCount = 0;
|
||||
Uint32 countSum = 0;
|
||||
int totalTestFailedCount = 0;
|
||||
int totalTestPassedCount = 0;
|
||||
int totalTestSkippedCount = 0;
|
||||
int testFailedCount = 0;
|
||||
int testPassedCount = 0;
|
||||
int testSkippedCount = 0;
|
||||
int countSum = 0;
|
||||
const SDLTest_TestCaseReference **failedTests;
|
||||
|
||||
/* Sanitize test iterations */
|
||||
|
Reference in New Issue
Block a user