Commit dd19c1a3 authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] report T_SKIPPED from t_dst

parent a165a17a
......@@ -470,7 +470,7 @@ t1(void) {
if (!dst_algorithm_supported(DST_ALG_RSAMD5)) {
dst_lib_destroy();
t_info("library built without crypto support\n");
t_result(T_UNTESTED);
t_result(T_SKIPPED);
return;
}
......@@ -984,7 +984,7 @@ t2_vfy(char **av) {
if (!dst_algorithm_supported(DST_ALG_RSAMD5)) {
dst_lib_destroy();
t_info("library built without crypto support\n");
return (T_UNTESTED);
return (T_SKIPPED);
}
t_info("testing %s, %s, %s, %s, %s, %s\n",
......
......@@ -38,7 +38,7 @@
#define T_PASS 0x1
#define T_FAIL 0x2
#define T_UNRESOLVED 0x3
#define T_UNSUPPORTED 0x4
#define T_SKIPPED 0x4
#define T_UNTESTED 0x5
#define T_THREADONLY 0x6
#define T_PKCS11ONLY 0x7
......
......@@ -410,8 +410,8 @@ t_result(int result) {
case T_UNRESOLVED:
p = "UNRESOLVED";
break;
case T_UNSUPPORTED:
p = "UNSUPPORTED";
case T_SKIPPED:
p = "SKIPPED";
break;
case T_UNTESTED:
p = "UNTESTED";
......@@ -762,11 +762,13 @@ t_eval(const char *filename, int (*func)(char **), int nargs) {
int line;
int cnt;
int result;
int tresult;
int nfails;
int nprobs;
int npass;
char *tokens[T_MAXTOKS + 1];
tresult = T_UNTESTED;
npass = 0;
nfails = 0;
nprobs = 0;
......@@ -788,14 +790,15 @@ t_eval(const char *filename, int (*func)(char **), int nargs) {
cnt = t_bustline(p, tokens);
if (cnt == nargs) {
result = func(tokens);
switch (result) {
tresult = func(tokens);
switch (tresult) {
case T_PASS:
++npass;
break;
case T_FAIL:
++nfails;
break;
case T_SKIPPED:
case T_UNTESTED:
break;
default:
......@@ -823,7 +826,7 @@ t_eval(const char *filename, int (*func)(char **), int nargs) {
else if (nfails > 0)
result = T_FAIL;
else if (npass == 0)
result = T_UNTESTED;
result = tresult;
return (result);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment