Harness warns about tests that request timeout when it's not
authorMarkus Kauppila
Mon, 18 Jul 2011 14:41:01 +0300
changeset 576736f7413f460f
parent 5766 8cc2ae74cd83
child 5768 40d331dc9c9e
Harness warns about tests that request timeout when it's not
available.
test/test-automation/plain_logger.c
test/test-automation/runner.c
     1.1 --- a/test/test-automation/plain_logger.c	Sun Jul 17 20:59:34 2011 -0700
     1.2 +++ b/test/test-automation/plain_logger.c	Mon Jul 18 14:41:01 2011 +0300
     1.3 @@ -2,10 +2,6 @@
     1.4  #ifndef _PLAIN_LOGGER
     1.5  #define _PLAIN_LOGGER
     1.6  
     1.7 -#include <stdio.h>
     1.8 -
     1.9 -#include <SDL/SDL.h>
    1.10 -
    1.11  #include "logger_helpers.h"
    1.12  #include "plain_logger.h"
    1.13  #include "SDL_test.h"
    1.14 @@ -21,13 +17,11 @@
    1.15  int
    1.16  Output(const int currentIndentLevel, const char *message, ...)
    1.17  {
    1.18 -
    1.19  	int ident = 0;
    1.20  	for( ; ident < currentIndentLevel; ++ident) {
    1.21  		fprintf(stdout, "  "); // \todo make configurable?
    1.22  	}
    1.23  
    1.24 -
    1.25      char buffer[1024];
    1.26  	memset(buffer, 0, 1024);
    1.27  
    1.28 @@ -38,7 +32,6 @@
    1.29  
    1.30  	va_end(list);
    1.31  
    1.32 -
    1.33  	fprintf(stdout, "%s\n", buffer);
    1.34  	fflush(stdout);
    1.35  }
    1.36 @@ -145,7 +138,7 @@
    1.37  void
    1.38  PlainLog(const char *logMessage, time_t eventTime)
    1.39  {
    1.40 -	Output(indentLevel, "%s %d", logMessage, TimestampToString(eventTime));
    1.41 +	Output(indentLevel, "%s", logMessage);
    1.42  }
    1.43  
    1.44  #endif
     2.1 --- a/test/test-automation/runner.c	Sun Jul 17 20:59:34 2011 -0700
     2.2 +++ b/test/test-automation/runner.c	Mon Jul 18 14:41:01 2011 +0300
     2.3 @@ -632,6 +632,9 @@
     2.4  	int retVal = -1;
     2.5  
     2.6  	if(execute_inproc) {
     2.7 +		if(testItem->timeout > 0) {
     2.8 +			Log("Test asked for timeout which is not supported.", time(0));
     2.9 +		}
    2.10  		retVal = RunTest(testItem);
    2.11  	} else {
    2.12  		int childpid = fork();