Harness warns about tests that request timeout when it's not
available.
This commit is contained in:
parent
9db859c159
commit
0bcc47f4b6
2 changed files with 4 additions and 8 deletions
|
@ -2,10 +2,6 @@
|
|||
#ifndef _PLAIN_LOGGER
|
||||
#define _PLAIN_LOGGER
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <SDL/SDL.h>
|
||||
|
||||
#include "logger_helpers.h"
|
||||
#include "plain_logger.h"
|
||||
#include "SDL_test.h"
|
||||
|
@ -21,13 +17,11 @@ static int indentLevel;
|
|||
int
|
||||
Output(const int currentIndentLevel, const char *message, ...)
|
||||
{
|
||||
|
||||
int ident = 0;
|
||||
for( ; ident < currentIndentLevel; ++ident) {
|
||||
fprintf(stdout, " "); // \todo make configurable?
|
||||
}
|
||||
|
||||
|
||||
char buffer[1024];
|
||||
memset(buffer, 0, 1024);
|
||||
|
||||
|
@ -38,7 +32,6 @@ Output(const int currentIndentLevel, const char *message, ...)
|
|||
|
||||
va_end(list);
|
||||
|
||||
|
||||
fprintf(stdout, "%s\n", buffer);
|
||||
fflush(stdout);
|
||||
}
|
||||
|
@ -145,7 +138,7 @@ PlainAssertSummary(int numAsserts, int numAssertsFailed, int numAssertsPass, tim
|
|||
void
|
||||
PlainLog(const char *logMessage, time_t eventTime)
|
||||
{
|
||||
Output(indentLevel, "%s %d", logMessage, TimestampToString(eventTime));
|
||||
Output(indentLevel, "%s", logMessage);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -632,6 +632,9 @@ ExecuteTest(TestCase *testItem) {
|
|||
int retVal = -1;
|
||||
|
||||
if(execute_inproc) {
|
||||
if(testItem->timeout > 0) {
|
||||
Log("Test asked for timeout which is not supported.", time(0));
|
||||
}
|
||||
retVal = RunTest(testItem);
|
||||
} else {
|
||||
int childpid = fork();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue