epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Changed many of the char* arguments to printf-style varargs.

Browse Source
This commit is contained in:
Andrew Johnson
2006-11-07 15:35:14 +00:00
parent 333c97ee23
commit dac306887d
2 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/misc/epicsUnitTest.c
+34 -15
View File
@@ -15,7 +15,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include "epicsThread.h"
#include "epicsMutex.h"
@@ -48,12 +47,12 @@ void testPlan(int plan) {
epicsMutexUnlock(testLock);
}
int testOk(int pass, const char *desc) {
int testOkV(int pass, const char *fmt, va_list pvar) {
const char *result = "not ok";
epicsMutexMustLock(testLock);
tested++;
if (pass) {
result += 4;
result += 4; /* skip "not " */
passed++;
if (todo)
bonus++;
@@ -63,20 +62,35 @@ int testOk(int pass, const char *desc) {
else
failed++;
}
printf("%s %2d - %s", result, tested, desc);
printf("%s %2d - ", result, tested);
vprintf(fmt, pvar);
if (todo)
printf(" # TODO %s", todo);
puts("");
putchar('\n');
epicsMutexUnlock(testLock);
return pass;
}
void testPass(const char *desc) {
testOk(1, desc);
int testOk(int pass, const char *fmt, ...) {
va_list pvar;
va_start(pvar, fmt);
testOkV(pass, fmt, pvar);
va_end(pvar);
return pass;
}
void testFail(const char *desc) {
testOk(0, desc);
void testPass(const char *fmt, ...) {
va_list pvar;
va_start(pvar, fmt);
testOkV(1, fmt, pvar);
va_end(pvar);
}
void testFail(const char *fmt, ...) {
va_list pvar;
va_start(pvar, fmt);
testOkV(0, fmt, pvar);
va_end(pvar);
}
void testSkip(int skip, const char *why) {
@@ -105,13 +119,18 @@ int testDiag(const char *fmt, ...) {
va_start(pvar, fmt);
printf("# ");
vprintf(fmt, pvar);
printf("\n");
putchar('\n');
va_end(pvar);
return 0;
}
void testAbort(const char *desc) {
printf("Bail out! %s\n", desc);
void testAbort(const char *fmt, ...) {
va_list pvar;
va_start(pvar, fmt);
printf("Bail out! ");
vprintf(fmt, pvar);
putchar('\n');
va_end(pvar);
abort();
}
@@ -121,17 +140,17 @@ static void testResult(const char *result, int count) {
int testDone(void) {
int status = 0;
char *value = getenv("HARNESS_ACTIVE");
char *harness = getenv("HARNESS_ACTIVE");
epicsMutexMustLock(testLock);
if (value) {
if (harness) {
if (!planned) printf("1..%d\n", tested);
} else {
if (planned && tested > planned) {
printf("\nRan %d tests but only planned for %d!\n", tested, planned);
status = 2;
} else if (planned && tested < planned) {
printf("\nPlanned %d tests but only ran %d\n", tested, planned);
printf("\nPlanned %d tests but only ran %d\n", planned, tested);
status = 2;
}
printf("\n Results\n =======\n Tests: %d\n", tested);
src/libCom/misc/epicsUnitTest.h
+15 -6
View File
@@ -9,6 +9,9 @@
* Author: Andrew Johnson
*/
#include <stdarg.h>
#include "compilerDependencies.h"
#include "shareLib.h"
#ifdef __cplusplus
@@ -16,17 +19,23 @@ extern "C" {
#endif
epicsShareFunc void testPlan(int tests);
epicsShareFunc int testOk(int pass, const char *desc);
epicsShareFunc void testPass(const char *desc);
epicsShareFunc void testFail(const char *desc);
epicsShareFunc int testOkV(int pass, const char *fmt, va_list pvar);
epicsShareFunc int testOk(int pass, const char *fmt, ...)
EPICS_PRINTF_STYLE(2, 3);
epicsShareFunc void testPass(const char *fmt, ...)
EPICS_PRINTF_STYLE(1, 2);
epicsShareFunc void testFail(const char *fmt, ...)
EPICS_PRINTF_STYLE(1, 2);
epicsShareFunc void testSkip(int skip, const char *why);
epicsShareFunc void testTodoBegin(const char *why);
epicsShareFunc void testTodoEnd();
epicsShareFunc int testDiag(const char *fmt, ...);
epicsShareFunc void testAbort(const char *desc);
epicsShareFunc int testDiag(const char *fmt, ...)
EPICS_PRINTF_STYLE(1, 2);
epicsShareFunc void testAbort(const char *fmt, ...)
EPICS_PRINTF_STYLE(1, 2);
epicsShareFunc int testDone(void);
#define testOk1(cond) testOk(cond, #cond)
#define testOk1(cond) testOk(cond, "%s", #cond)
#ifdef __cplusplus
}