[master] report T_SKIPPED from t_dst
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user