selftests/clone3: report a correct number of fails
authorAndrei Vagin <avagin@gmail.com>
Mon, 18 Nov 2019 06:47:49 +0000 (22:47 -0800)
committerChristian Brauner <christian.brauner@ubuntu.com>
Mon, 18 Nov 2019 07:57:54 +0000 (08:57 +0100)
In clone3_set_tid, a few test cases are running in a child process.  And
right now, if one of these test cases fails, the whole test will exit
with the success status.

Fixes: 41585bbeeef9 ("selftests: add tests for clone3() with *set_tid")
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Link: https://lore.kernel.org/r/20191118064750.408003-2-avagin@gmail.com
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
tools/testing/selftests/clone3/clone3_set_tid.c

index e93369d..9c19bae 100644 (file)
@@ -316,7 +316,7 @@ int main(int argc, char *argv[])
                 */
                test_clone3_set_tid(set_tid, 3, CLONE_NEWPID, 0, 42, true);
 
-               child_exit(ksft_cnt.ksft_pass);
+               child_exit(ksft_cnt.ksft_fail);
        }
 
        close(pipe_1[1]);
@@ -366,12 +366,8 @@ int main(int argc, char *argv[])
        if (!WIFEXITED(status))
                ksft_test_result_fail("Child error\n");
 
-       if (WEXITSTATUS(status))
-               /*
-                * Update the number of total tests with the tests from the
-                * child processes.
-                */
-               ksft_cnt.ksft_pass = WEXITSTATUS(status);
+       ksft_cnt.ksft_pass += 4 - (ksft_cnt.ksft_fail - WEXITSTATUS(status));
+       ksft_cnt.ksft_fail = WEXITSTATUS(status);
 
        if (ns3 == pid && ns2 == 42 && ns1 == 1)
                ksft_test_result_pass(