selftests: kselftest_harness: save full exit code in metadata

[sfrench/cifs-2.6.git] / tools / testing / selftests / kselftest_harness.h

diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index 4a2bda6a67ed7f69c0de61b8e6b8e043d0f08a15..d90d4a9039ee2265443eed545bcd3154e6b06388 100644 (file)
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -128,7 +128,7 @@
                fprintf(TH_LOG_STREAM, "#      SKIP      %s\n", \
                        _metadata->results->reason); \
        } \
-       _metadata->passed = 1; \
+       _metadata->exit_code = KSFT_PASS; \
        _metadata->skip = 1; \
        _metadata->trigger = 0; \
        statement; \
@@ -387,7 +387,7 @@
                if (setjmp(_metadata->env) == 0) { \
                        fixture_name##_setup(_metadata, &self, variant->data); \
                        /* Let setup failure terminate early. */ \
-                       if (!_metadata->passed || _metadata->skip) \
+                       if (!__test_passed(_metadata) || _metadata->skip) \
                                return; \
                        _metadata->setup_completed = true; \
                        /* Use the same _metadata. */ \
@@ -398,7 +398,7 @@
                        } \
                        if (child < 0) { \
                                ksft_print_msg("ERROR SPAWNING TEST GRANDCHILD\n"); \
-                               _metadata->passed = 0; \
+                               _metadata->exit_code = KSFT_FAIL; \
                        } \
                } \
                if (child == 0) \
@@ -747,7 +747,7 @@
                        break; \
                        } \
                } \
-               _metadata->passed = 0; \
+               _metadata->exit_code = KSFT_FAIL; \
                /* Ensure the optional handler is triggered */ \
                _metadata->trigger = 1; \
        } \
@@ -758,7 +758,7 @@
        const char *__seen = (_seen); \
        if (!(strcmp(__exp, __seen) _t 0))  { \
                __TH_LOG("Expected '%s' %s '%s'.", __exp, #_t, __seen); \
-               _metadata->passed = 0; \
+               _metadata->exit_code = KSFT_FAIL; \
                _metadata->trigger = 1; \
        } \
 } while (0); OPTIONAL_HANDLER(_assert)
@@ -836,7 +836,7 @@ struct __test_metadata {
        pid_t pid;      /* pid of test when being run */
        struct __fixture_metadata *fixture;
        int termsig;
-       int passed;
+       int exit_code;
        int skip;       /* did SKIP get used? */
        int trigger; /* extra handler after the evaluation */
        int timeout;    /* seconds to wait for test timeout */
@@ -848,6 +848,12 @@ struct __test_metadata {
        struct __test_metadata *prev, *next;
 };
 
+static inline bool __test_passed(struct __test_metadata *metadata)
+{
+       return metadata->exit_code != KSFT_FAIL &&
+              metadata->exit_code <= KSFT_SKIP;
+}
+
 /*
  * Since constructors are called in reverse order, reverse the test
  * list so tests are run in source declaration order.
@@ -912,7 +918,7 @@ void __wait_for_test(struct __test_metadata *t)
        int status;
 
        if (sigaction(SIGALRM, &action, &saved_action)) {
-               t->passed = 0;
+               t->exit_code = KSFT_FAIL;
                fprintf(TH_LOG_STREAM,
                        "# %s: unable to install SIGALRM handler\n",
                        t->name);
@@ -924,7 +930,7 @@ void __wait_for_test(struct __test_metadata *t)
        waitpid(t->pid, &status, 0);
        alarm(0);
        if (sigaction(SIGALRM, &saved_action, NULL)) {
-               t->passed = 0;
+               t->exit_code = KSFT_FAIL;
                fprintf(TH_LOG_STREAM,
                        "# %s: unable to uninstall SIGALRM handler\n",
                        t->name);
@@ -933,16 +939,16 @@ void __wait_for_test(struct __test_metadata *t)
        __active_test = NULL;
 
        if (t->timed_out) {
-               t->passed = 0;
+               t->exit_code = KSFT_FAIL;
                fprintf(TH_LOG_STREAM,
                        "# %s: Test terminated by timeout\n", t->name);
        } else if (WIFEXITED(status)) {
                if (WEXITSTATUS(status) == KSFT_SKIP) {
                        /* SKIP */
-                       t->passed = 1;
+                       t->exit_code = KSFT_PASS;
                        t->skip = 1;
                } else if (t->termsig != -1) {
-                       t->passed = 0;
+                       t->exit_code = KSFT_FAIL;
                        fprintf(TH_LOG_STREAM,
                                "# %s: Test exited normally instead of by signal (code: %d)\n",
                                t->name,
@@ -951,24 +957,24 @@ void __wait_for_test(struct __test_metadata *t)
                        switch (WEXITSTATUS(status)) {
                        /* Success */
                        case KSFT_PASS:
-                               t->passed = 1;
+                               t->exit_code = KSFT_PASS;
                                break;
                        /* Failure */
                        default:
-                               t->passed = 0;
+                               t->exit_code = KSFT_FAIL;
                                fprintf(TH_LOG_STREAM,
                                        "# %s: Test failed\n",
                                        t->name);
                        }
                }
        } else if (WIFSIGNALED(status)) {
-               t->passed = 0;
+               t->exit_code = KSFT_FAIL;
                if (WTERMSIG(status) == SIGABRT) {
                        fprintf(TH_LOG_STREAM,
                                "# %s: Test terminated by assertion\n",
                                t->name);
                } else if (WTERMSIG(status) == t->termsig) {
-                       t->passed = 1;
+                       t->exit_code = KSFT_PASS;
                } else {
                        fprintf(TH_LOG_STREAM,
                                "# %s: Test terminated unexpectedly by signal %d\n",
@@ -1111,7 +1117,7 @@ void __run_test(struct __fixture_metadata *f,
        char test_name[LINE_MAX];
 
        /* reset test struct */
-       t->passed = 1;
+       t->exit_code = KSFT_PASS;
        t->skip = 0;
        t->trigger = 0;
        memset(t->results->reason, 0, sizeof(t->results->reason));
@@ -1128,26 +1134,26 @@ void __run_test(struct __fixture_metadata *f,
        t->pid = fork();
        if (t->pid < 0) {
                ksft_print_msg("ERROR SPAWNING TEST CHILD\n");
-               t->passed = 0;
+               t->exit_code = KSFT_FAIL;
        } else if (t->pid == 0) {
                setpgrp();
                t->fn(t, variant);
                if (t->skip)
                        _exit(KSFT_SKIP);
-               if (t->passed)
+               if (__test_passed(t))
                        _exit(KSFT_PASS);
                _exit(KSFT_FAIL);
        } else {
                __wait_for_test(t);
        }
        ksft_print_msg("         %4s  %s\n",
-                      t->passed ? "OK" : "FAIL", test_name);
+                      __test_passed(t) ? "OK" : "FAIL", test_name);
 
        if (t->skip)
                ksft_test_result_skip("%s\n", t->results->reason[0] ?
                                        t->results->reason : "unknown");
        else
-               ksft_test_result(t->passed, "%s\n", test_name);
+               ksft_test_result(__test_passed(t), "%s\n", test_name);
 }
 
 static int test_harness_run(int argc, char **argv)
@@ -1195,7 +1201,7 @@ static int test_harness_run(int argc, char **argv)
                                t->results = results;
                                __run_test(f, v, t);
                                t->results = NULL;
-                               if (t->passed)
+                               if (__test_passed(t))
                                        pass_count++;
                                else
                                        ret = 1;