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

Refactored a bit.

Browse source
This commit is contained in:
Markus Kauppila 2011-07-18 15:25:54 +03:00
parent 0bcc47f4b6
commit 00fc5d8daf
1 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,6 +131,7 @@ TestCaseReference **QueryTestCaseReferences(void *library);
TestCaseSetUpFp LoadTestSetUpFunction(void *suite); TestCaseSetUpFp LoadTestSetUpFunction(void *suite);
TestCaseTearDownFp LoadTestTearDownFunction(void *suite); TestCaseTearDownFp LoadTestTearDownFunction(void *suite);
CountFailedAssertsFp LoadCountFailedAssertsFunction(void *suite); CountFailedAssertsFp LoadCountFailedAssertsFunction(void *suite);
void KillHungTest(int signum);
/*! Pointers to selected logger implementation */ /*! Pointers to selected logger implementation */
@ -573,6 +574,31 @@ LoadCountFailedAssertsFunction(void *suite) {
} }
/*!
* Set timeout for test.
*
* \param timeout Timeout interval in seconds!
* \param callback Function that will be called after timeout has elapsed
*/
void SetTestTimeout(int timeout, void (*callback)(int))
{
#if 0
/* Note:
* SDL_Init(SDL_INIT_TIMER) should be successfully called before using this
*/
int timeoutInMilliseconds = timeout * 1000;
SDL_TimerID timerID = SDL_AddTimer(timeoutInMilliseconds, callback, 0x0);
if(timerID == NULL) {
fprintf(stderr, "Error: Creation of SDL timer failed.\n");
fprintf(stderr, "%s\n", SDL_GetError());
}
#else
signal(SIGALRM, callback);
alarm((unsigned int) timeout);
#endif
}
/*! /*!
* Kills test that hungs. Test hungs when its execution * Kills test that hungs. Test hungs when its execution
* takes longer than timeout specified for it. * takes longer than timeout specified for it.
@ -585,7 +611,8 @@ LoadCountFailedAssertsFunction(void *suite) {
* *
* \param signum * \param signum
*/ */
void KillHungTest(int signum) { void KillHungTest(int signum)
{
exit(TEST_RESULT_KILLED); exit(TEST_RESULT_KILLED);
} }
@ -598,7 +625,17 @@ void KillHungTest(int signum) {
* \param test result * \param test result
*/ */
int int
RunTest(TestCase *testItem) { RunTest(TestCase *testItem)
{
if(testItem->timeout > 0) {
if(execute_inproc) {
Log("Test asked for timeout which is not supported.", time(0));
}
else {
SetTestTimeout(testItem->timeout, KillHungTest);
}
}
testItem->initTestEnvironment(); testItem->initTestEnvironment();
if(testItem->testSetUp) { if(testItem->testSetUp) {
@ -632,18 +669,10 @@ 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();
if(childpid == 0) { if(childpid == 0) {
if(testItem->timeout > 0) {
signal(SIGALRM, KillHungTest);
alarm((unsigned int) testItem->timeout);
}
exit(RunTest(testItem)); exit(RunTest(testItem));
} else { } else {
int stat_lock = -1; int stat_lock = -1;