meson: Turn on -Werror

We can choose which compile warnings to enable, but once they are enabled
treat all warnings as error. This enforces stricter checks against compile
warnings creeping in.

v2: Fix redefinition warning errors from i915/gem_userptr_blits
v3: Fix the even more pedantic clang compilation
v4: Do not alter whitespace in lib/tests/igt_describe!

Note: clang does not build assembler/

Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

11 files changed, 49 insertions, 45 deletions

diff --git a/lib/tests/igt_abort.c b/lib/tests/igt_abort.c
index 53b7d4fd..356e4167 100644
--- a/lib/tests/igt_abort.c
+++ b/lib/tests/igt_abort.c
@@ -31,7 +31,7 @@ char test[] = "test";
 char *fake_argv[] = { test };
 int fake_argc = ARRAY_SIZE(fake_argv);
 
-static void fake_simple_test(void)
+__noreturn static void fake_simple_test(void)
 {
 	igt_simple_init(fake_argc, fake_argv);
 
@@ -40,7 +40,7 @@ static void fake_simple_test(void)
 	exit(0); /* unreachable */
 }
 
-static void fake_fixture_test(void)
+__noreturn static void fake_fixture_test(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -51,7 +51,7 @@ static void fake_fixture_test(void)
 	exit(0); /* unreachable */
 }
 
-static void fake_outside_fixture_test(void)
+__noreturn static void fake_outside_fixture_test(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -60,7 +60,7 @@ static void fake_outside_fixture_test(void)
 	exit(0); /* unreachable */
 }
 
-static void fake_subtest_test(void)
+__noreturn static void fake_subtest_test(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -76,7 +76,7 @@ static void fake_subtest_test(void)
 	exit(0); /* unreachable */
 }
 
-static void fake_dynamic_test(void)
+__noreturn static void fake_dynamic_test(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -97,7 +97,7 @@ static void fake_dynamic_test(void)
 	exit(0); /* unreachable */
 }
 
-static void fake_outside_dynamic_test(void)
+__noreturn static void fake_outside_dynamic_test(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
diff --git a/lib/tests/igt_assert.c b/lib/tests/igt_assert.c
index c94ac698..3523a464 100644
--- a/lib/tests/igt_assert.c
+++ b/lib/tests/igt_assert.c
@@ -53,7 +53,7 @@ void (*test_to_run)(void) = NULL;
 	exec_total++; \
 }
 
-static void fake_test(void)
+__noreturn static void fake_test(void)
 {
 	char test[] = "test";
 	char *argv_run[] = { test };
diff --git a/lib/tests/igt_conflicting_args.c b/lib/tests/igt_conflicting_args.c
index b644fd4b..b5fe2d78 100644
--- a/lib/tests/igt_conflicting_args.c
+++ b/lib/tests/igt_conflicting_args.c
@@ -43,7 +43,7 @@ static int opt_handler(int option, int option_index, void *input)
 	return 0;
 }
 
-static void fake_test(void)
+__noreturn static void fake_test(void)
 {
 	char test_name[] = "test";
 	char *argv[] = { test_name };
diff --git a/lib/tests/igt_describe.c b/lib/tests/igt_describe.c
index ff45a6c4..d71e051e 100644
--- a/lib/tests/igt_describe.c
+++ b/lib/tests/igt_describe.c
@@ -34,7 +34,7 @@ char *fake_argv[] = {prog, fake_arg};
 int fake_argc = ARRAY_SIZE(fake_argv);
 
 IGT_TEST_DESCRIPTION("the top level description");
-static void fake_main(void)
+__noreturn static void fake_main(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
diff --git a/lib/tests/igt_dynamic_subtests.c b/lib/tests/igt_dynamic_subtests.c
index bd1e1675..b18cfae6 100644
--- a/lib/tests/igt_dynamic_subtests.c
+++ b/lib/tests/igt_dynamic_subtests.c
@@ -29,7 +29,7 @@
 
 #include "igt_tests_common.h"
 
-static void dynamic_subtest_in_normal_subtest(void)
+__noreturn static void dynamic_subtest_in_normal_subtest(void)
 {
 	char prog[] = "igt_no_exit";
 	char *fake_argv[] = {prog};
@@ -46,7 +46,7 @@ static void dynamic_subtest_in_normal_subtest(void)
 	igt_exit();
 }
 
-static void invalid_dynamic_subtest_name(void)
+__noreturn static void invalid_dynamic_subtest_name(void)
 {
 	char prog[] = "igt_no_exit";
 	char *fake_argv[] = {prog};
@@ -63,7 +63,7 @@ static void invalid_dynamic_subtest_name(void)
 	igt_exit();
 }
 
-static void dynamic_subtest_in_toplevel(void)
+__noreturn static void dynamic_subtest_in_toplevel(void)
 {
 	char prog[] = "igt_no_exit";
 	char *fake_argv[] = {prog};
@@ -78,7 +78,7 @@ static void dynamic_subtest_in_toplevel(void)
 	igt_exit();
 }
 
-static void subtest_itself_failing(void)
+__noreturn static void subtest_itself_failing(void)
 {
 	char prog[] = "igt_no_exit";
 	char *fake_argv[] = {prog};
@@ -93,7 +93,7 @@ static void subtest_itself_failing(void)
 	igt_exit();
 }
 
-static void subtest_itself_skipping(void)
+__noreturn static void subtest_itself_skipping(void)
 {
 	char prog[] = "igt_no_exit";
 	char *fake_argv[] = {prog};
@@ -108,7 +108,7 @@ static void subtest_itself_skipping(void)
 	igt_exit();
 }
 
-static void dynamic_subtest_failure_leads_to_fail(void)
+__noreturn static void dynamic_subtest_failure_leads_to_fail(void)
 {
 	char prog[] = "igt_no_exit";
 	char *fake_argv[] = {prog};
@@ -125,7 +125,7 @@ static void dynamic_subtest_failure_leads_to_fail(void)
 	igt_exit();
 }
 
-static void no_dynamic_subtests_entered_leads_to_skip(void)
+__noreturn static void no_dynamic_subtests_entered_leads_to_skip(void)
 {
 	char prog[] = "igt_no_exit";
 	char *fake_argv[] = {prog};
diff --git a/lib/tests/igt_fork.c b/lib/tests/igt_fork.c
index 84492b2d..d19d0945 100644
--- a/lib/tests/igt_fork.c
+++ b/lib/tests/igt_fork.c
@@ -38,7 +38,7 @@ char test[] = "test";
 char *fake_argv[] = { test };
 int fake_argc = ARRAY_SIZE(fake_argv);
 
-static void igt_fork_vs_skip(void)
+__noreturn static void igt_fork_vs_skip(void)
 {
 	igt_simple_init(fake_argc, fake_argv);
 
@@ -51,7 +51,7 @@ static void igt_fork_vs_skip(void)
 	igt_exit();
 }
 
-static void igt_fork_vs_assert(void)
+__noreturn static void igt_fork_vs_assert(void)
 {
 	igt_simple_init(fake_argc, fake_argv);
 
@@ -64,7 +64,7 @@ static void igt_fork_vs_assert(void)
 	igt_exit();
 }
 
-static void igt_fork_leak(void)
+__noreturn static void igt_fork_leak(void)
 {
 	igt_simple_init(fake_argc, fake_argv);
 
@@ -75,7 +75,7 @@ static void igt_fork_leak(void)
 	igt_exit();
 }
 
-static void plain_fork_leak(void)
+__noreturn static void plain_fork_leak(void)
 {
 	int pid;
 
@@ -93,7 +93,7 @@ static void plain_fork_leak(void)
 	igt_exit();
 }
 
-static void igt_fork_timeout_leak(void)
+__noreturn static void igt_fork_timeout_leak(void)
 {
 	igt_simple_init(fake_argc, fake_argv);
 
@@ -106,7 +106,7 @@ static void igt_fork_timeout_leak(void)
 	igt_exit();
 }
 
-static void subtest_leak(void)
+__noreturn static void subtest_leak(void)
 {
 	pid_t *children =
 		mmap(0, 4096, PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
diff --git a/lib/tests/igt_invalid_subtest_name.c b/lib/tests/igt_invalid_subtest_name.c
index 32c4bcbc..b790482c 100644
--- a/lib/tests/igt_invalid_subtest_name.c
+++ b/lib/tests/igt_invalid_subtest_name.c
@@ -29,7 +29,7 @@
 
 #include "igt_tests_common.h"
 
-static void invalid_subtest_name(void)
+__noreturn static void invalid_subtest_name(void)
 {
 	char prog[] = "igt_no_exit";
 	char *fake_argv[] = {prog};
@@ -44,7 +44,7 @@ static void invalid_subtest_name(void)
 	igt_exit();
 }
 
-static void nonexisting_subtest(void)
+__noreturn static void nonexisting_subtest(void)
 {
 	char prog[] = "igt_no_exit";
 	char arg1[] = "--run-subtest";
diff --git a/lib/tests/igt_nesting.c b/lib/tests/igt_nesting.c
index de674b6b..6b209af8 100644
--- a/lib/tests/igt_nesting.c
+++ b/lib/tests/igt_nesting.c
@@ -30,7 +30,7 @@ char test[] = "test";
 char *fake_argv[] = { test };
 int fake_argc = ARRAY_SIZE(fake_argv);
 
-static void all_valid_simple_test(void)
+__noreturn static void all_valid_simple_test(void)
 {
 	igt_simple_init(fake_argc, fake_argv);
 
@@ -40,7 +40,7 @@ static void all_valid_simple_test(void)
 	igt_exit();
 }
 
-static void all_valid(void)
+__noreturn static void all_valid(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -87,7 +87,7 @@ static void all_valid(void)
 	igt_exit();
 }
 
-static void invalid_subtest_in_simple_test(void)
+__noreturn static void invalid_subtest_in_simple_test(void)
 {
 	igt_simple_init(fake_argc, fake_argv);
 
@@ -97,7 +97,7 @@ static void invalid_subtest_in_simple_test(void)
 	igt_exit();
 }
 
-static void invalid_subtest_group_in_simple_test(void)
+__noreturn static void invalid_subtest_group_in_simple_test(void)
 {
 	igt_simple_init(fake_argc, fake_argv);
 
@@ -107,7 +107,7 @@ static void invalid_subtest_group_in_simple_test(void)
 	igt_exit();
 }
 
-static void invalid_subtest_with_dynamic_in_simple_test(void)
+__noreturn static void invalid_subtest_with_dynamic_in_simple_test(void)
 {
 	igt_simple_init(fake_argc, fake_argv);
 
@@ -117,7 +117,7 @@ static void invalid_subtest_with_dynamic_in_simple_test(void)
 	igt_exit();
 }
 
-static void invalid_dynamic_in_simple_test(void)
+__noreturn static void invalid_dynamic_in_simple_test(void)
 {
 	igt_simple_init(fake_argc, fake_argv);
 
@@ -127,7 +127,7 @@ static void invalid_dynamic_in_simple_test(void)
 	igt_exit();
 }
 
-static void invalid_fixture_in_fixture(void)
+__noreturn static void invalid_fixture_in_fixture(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -139,7 +139,7 @@ static void invalid_fixture_in_fixture(void)
 	igt_exit();
 }
 
-static void invalid_subtest_in_subtest(void)
+__noreturn static void invalid_subtest_in_subtest(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -151,7 +151,7 @@ static void invalid_subtest_in_subtest(void)
 	igt_exit();
 }
 
-static void invalid_top_level_dynamic(void)
+__noreturn static void invalid_top_level_dynamic(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -161,7 +161,7 @@ static void invalid_top_level_dynamic(void)
 	igt_exit();
 }
 
-static void invalid_dynamic_in_regular_subtest(void)
+__noreturn static void invalid_dynamic_in_regular_subtest(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -173,7 +173,7 @@ static void invalid_dynamic_in_regular_subtest(void)
 	igt_exit();
 }
 
-static void invalid_fixture_in_subtest(void)
+__noreturn static void invalid_fixture_in_subtest(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -185,7 +185,7 @@ static void invalid_fixture_in_subtest(void)
 	igt_exit();
 }
 
-static void invalid_top_level_skip(void)
+__noreturn static void invalid_top_level_skip(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -194,7 +194,7 @@ static void invalid_top_level_skip(void)
 	igt_exit();
 }
 
-static void invalid_top_level_assert(void)
+__noreturn static void invalid_top_level_assert(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
@@ -203,7 +203,7 @@ static void invalid_top_level_assert(void)
 	igt_exit();
 }
 
-static void invalid_dynamic_in_dynamic(void)
+__noreturn static void invalid_dynamic_in_dynamic(void)
 {
 	igt_subtest_init(fake_argc, fake_argv);
 
diff --git a/lib/tests/igt_segfault.c b/lib/tests/igt_segfault.c
index 38c040a6..56efa912 100644
--- a/lib/tests/igt_segfault.c
+++ b/lib/tests/igt_segfault.c
@@ -54,7 +54,7 @@ static void crashme(void)
 	raise(SIGSEGV);
 }
 
-static void fake_test(void)
+__noreturn static void fake_test(void)
 {
 	char prog[] = "test";
 	char *fake_argv[] = { prog };
diff --git a/lib/tests/igt_simulation.c b/lib/tests/igt_simulation.c
index a0ea7000..9a2cf2aa 100644
--- a/lib/tests/igt_simulation.c
+++ b/lib/tests/igt_simulation.c
@@ -40,7 +40,7 @@ bool list_subtests;
 bool in_fixture;
 bool in_subtest;
 
-static void fake_test(void)
+__noreturn static void fake_test(void)
 {
 	char test[] = "test";
 	char list[] = "--list-subtests";
diff --git a/lib/tests/igt_thread.c b/lib/tests/igt_thread.c
index e9d37584..eb92326d 100644
--- a/lib/tests/igt_thread.c
+++ b/lib/tests/igt_thread.c
@@ -49,7 +49,8 @@ static void *require_thread(void *data)
 	return NULL;
 }
 
-static void one_subtest_fail(void) {
+__noreturn static void one_subtest_fail(void)
+{
 	igt_subtest_init(fake_argc, fake_argv);
 
 	igt_subtest("subtest-a") {
@@ -67,7 +68,8 @@ static void one_subtest_fail(void) {
 	igt_exit();
 }
 
-static void one_dynamic_fail(void) {
+__noreturn static void one_dynamic_fail(void)
+{
 	igt_subtest_init(fake_argc, fake_argv);
 
 	igt_subtest_with_dynamic("dynamic-container") {
@@ -87,7 +89,7 @@ static void one_dynamic_fail(void) {
 	igt_exit();
 }
 
-static void simple_success(void) {
+__noreturn static void simple_success(void) {
 	pthread_t thread;
 
 	igt_simple_init(fake_argc, fake_argv);
@@ -98,7 +100,8 @@ static void simple_success(void) {
 	igt_exit();
 }
 
-static void simple_failure(void) {
+__noreturn static void simple_failure(void)
+{
 	pthread_t thread;
 
 	igt_simple_init(fake_argc, fake_argv);
@@ -109,7 +112,8 @@ static void simple_failure(void) {
 	igt_exit();
 }
 
-static void require_non_main_thread(void) {
+__noreturn static void require_non_main_thread(void)
+{
 	pthread_t thread;
 
 	igt_simple_init(fake_argc, fake_argv);