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

Fixed logging noise coming from unimplemented optional test

Browse source 
suite functions SetUp and TearDown.
This commit is contained in:
Markus Kauppila 2011-07-17 11:17:40 +03:00
parent 254a81687d
commit c9ca0a4609
1 changed files with 19 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -496,13 +496,7 @@ LoadTestCaseFunction(void *suite, char *testName)
*/ */
TestCaseSetUpFp TestCaseSetUpFp
LoadTestSetUpFunction(void *suite) { LoadTestSetUpFunction(void *suite) {
TestCaseSetUpFp testSetUp = (TestCaseSetUpFp) SDL_LoadFunction(suite, "SetUp"); return (TestCaseSetUpFp) SDL_LoadFunction(suite, "SetUp");
if(testSetUp == NULL) {
fprintf(stderr, "Loading SetUp function failed, testSetUp == NULL\n");
fprintf(stderr, "%s\n", SDL_GetError());
}
return testSetUp;
} }
@ -516,13 +510,7 @@ LoadTestSetUpFunction(void *suite) {
*/ */
TestCaseTearDownFp TestCaseTearDownFp
LoadTestTearDownFunction(void *suite) { LoadTestTearDownFunction(void *suite) {
TestCaseTearDownFp testTearDown = (TestCaseTearDownFp) SDL_LoadFunction(suite, "TearDown"); return (TestCaseTearDownFp) SDL_LoadFunction(suite, "TearDown");
if(testTearDown == NULL) {
fprintf(stderr, "Loading TearDown function failed, testTearDown == NULL\n");
fprintf(stderr, "%s\n", SDL_GetError());
}
return testTearDown;
} }
@ -585,6 +573,23 @@ LoadCountFailedAssertsFunction(void *suite) {
} }
/*!
* Kills test that hungs. Test hungs when its execution
* takes longer than timeout specified for it.
*
* When test will be killed SIG_ALRM will be triggered and
* it'll call this function which kills the test process.
*
* Note: if runner is executed with --in-proc then hung tests
* can't be killed
*
* \param signum
*/
void KillHungTest(int signum) {
exit(TEST_RESULT_KILLED);
}
/* /*
* Execute a test. Loads the test, executes it and * Execute a test. Loads the test, executes it and
* returns the tests return value to the caller. * returns the tests return value to the caller.
@ -614,21 +619,6 @@ RunTest(TestCase *testItem) {
return testItem->quitTestEnvironment(); return testItem->quitTestEnvironment();
} }
/*!
* Kills test that hungs. Test hungs when its execution
* takes longer than timeout specified for it.
*
* When test will be killed SIG_ALRM will be triggered and
* it'll call this function which kills the test process.
*
* Note: if runner is executed with --in-proc then hung tests
* can't be killed
*
* \param signum
*/
void KillHungTest(int signum) {
exit(TEST_RESULT_KILLED);
}
/*! /*!
* Sets up a test case. Decideds wheter the test will * Sets up a test case. Decideds wheter the test will