Add testHarnessDone

This commit is contained in:
Andrew Johnson
2015-07-17 18:06:58 -05:00
parent 625172419e
commit 002bafdf07
3 changed files with 10 additions and 3 deletions

View File

@@ -210,7 +210,7 @@ int testDone(void) {
/* Our test harness, for RTEMS and vxWorks */
static void harnessExit(void *dummy) {
void testHarnessExit(void *dummy) {
epicsTimeStamp ended;
int Faulty;
@@ -247,7 +247,7 @@ static void harnessExit(void *dummy) {
void testHarness(void) {
epicsThreadOnce(&onceFlag, testOnce, NULL);
epicsAtExit(harnessExit, NULL);
epicsAtExit(testHarnessExit, NULL);
Harness = 1;
Programs = 0;
Tests = 0;

View File

@@ -40,9 +40,11 @@ epicsShareFunc int testDone(void);
typedef int (*TESTFUNC)(void);
epicsShareFunc void testHarness(void);
epicsShareFunc void testHarnessExit(void *dummy);
epicsShareFunc void runTestFunc(const char *name, TESTFUNC func);
#define runTest(func) runTestFunc(#func, func)
#define testHarnessDone() testHarnessExit(0)
#ifdef __cplusplus
}

View File

@@ -104,7 +104,12 @@ void epicsRunLibComTests(void)
runTest(taskwdTest);
/*
* Exit must come last as it never returns
* Report now in case epicsExitTest dies
*/
testHarnessDone();
/*
* epicsExitTest must come last as it never returns
*/
runTest(epicsExitTest);
}