pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Harness warns about tests that request timeout when it's not

Browse source 
available.
This commit is contained in:
Markus Kauppila 2011-07-18 14:41:01 +03:00
parent 9db859c159
commit 0bcc47f4b6
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/test-automation/plain_logger.c
View file

@ -2,10 +2,6 @@
#ifndef _PLAIN_LOGGER #ifndef _PLAIN_LOGGER
#define _PLAIN_LOGGER #define _PLAIN_LOGGER
#include <stdio.h>
#include <SDL/SDL.h>
#include "logger_helpers.h" #include "logger_helpers.h"
#include "plain_logger.h" #include "plain_logger.h"
#include "SDL_test.h" #include "SDL_test.h"
@ -21,13 +17,11 @@ static int indentLevel;
int int
Output(const int currentIndentLevel, const char *message, ...) Output(const int currentIndentLevel, const char *message, ...)
{ {
int ident = 0; int ident = 0;
for( ; ident < currentIndentLevel; ++ident) { for( ; ident < currentIndentLevel; ++ident) {
fprintf(stdout, " "); // \todo make configurable? fprintf(stdout, " "); // \todo make configurable?
} }
char buffer[1024]; char buffer[1024];
memset(buffer, 0, 1024); memset(buffer, 0, 1024);
@ -38,7 +32,6 @@ Output(const int currentIndentLevel, const char *message, ...)
va_end(list); va_end(list);
fprintf(stdout, "%s\n", buffer); fprintf(stdout, "%s\n", buffer);
fflush(stdout); fflush(stdout);
} }
@ -145,7 +138,7 @@ PlainAssertSummary(int numAsserts, int numAssertsFailed, int numAssertsPass, tim
void void
PlainLog(const char *logMessage, time_t eventTime) PlainLog(const char *logMessage, time_t eventTime)
{ {
Output(indentLevel, "%s %d", logMessage, TimestampToString(eventTime)); Output(indentLevel, "%s", logMessage);
} }
#endif #endif

3
test/test-automation/runner.c
View file

@ -632,6 +632,9 @@ ExecuteTest(TestCase *testItem) {
int retVal = -1; int retVal = -1;
if(execute_inproc) { if(execute_inproc) {
if(testItem->timeout > 0) {
Log("Test asked for timeout which is not supported.", time(0));
}
retVal = RunTest(testItem); retVal = RunTest(testItem);
} else { } else {
int childpid = fork(); int childpid = fork();