[igt-dev] [PATCH i-g-t 4/6] lib/tests: Convert no_exit tests into positive tests

[Daniel Vetter <daniel.vetter@ffwll.ch>]

This way we can make sure they die with an assert, which is what we
want.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 lib/tests/igt_no_exit.c           | 50 ++++++++++++++++++++++++++++++-
 lib/tests/igt_no_exit_list_only.c | 41 -------------------------
 lib/tests/meson.build             | 17 +++++------
 3 files changed, 57 insertions(+), 51 deletions(-)
 delete mode 100644 lib/tests/igt_no_exit_list_only.c

diff --git a/lib/tests/igt_no_exit.c b/lib/tests/igt_no_exit.c
index dc89b8302a71..4a777412b6a9 100644
--- a/lib/tests/igt_no_exit.c
+++ b/lib/tests/igt_no_exit.c
@@ -25,9 +25,26 @@
  *
  */
 
+#include <sys/wait.h>
+
 #include "drmtest.h"
 
-int main(int argc, char **argv)
+#include "igt_tests_common.h"
+
+static void no_exit_list_only(void)
+{
+	char prog[] = "igt_list_only";
+	char arg[] = "--list-subtests";
+	char *fake_argv[] = {prog, arg};
+	int fake_argc = 2;
+
+	igt_subtest_init(fake_argc, fake_argv);
+
+	igt_subtest("A")
+		;
+}
+
+static void no_exit(void)
 {
 	char prog[] = "igt_no_exit";
 	char *fake_argv[] = {prog};
@@ -38,3 +55,34 @@ int main(int argc, char **argv)
 	igt_subtest("A")
 		;
 }
+
+static int do_fork(void (*test_to_run)(void))
+{
+	int pid, status;
+
+	switch (pid = fork()) {
+	case -1:
+		internal_assert(0);
+	case 0:
+		test_to_run();
+	default:
+		while (waitpid(pid, &status, 0) == -1 &&
+		       errno == EINTR)
+			;
+
+		return status;
+	}
+}
+
+int main(int argc, char **argv)
+{
+	int ret;
+
+	ret = do_fork(no_exit);
+	internal_assert_wsignaled(ret, SIGABRT);
+
+	ret = do_fork(no_exit_list_only);
+	internal_assert_wsignaled(ret, SIGABRT);
+
+	return 0;
+}
diff --git a/lib/tests/igt_no_exit_list_only.c b/lib/tests/igt_no_exit_list_only.c
deleted file mode 100644
index add3fc257e66..000000000000
--- a/lib/tests/igt_no_exit_list_only.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright © 2013 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Daniel Vetter <daniel.vetter@ffwll.ch>
- *
- */
-
-#include "drmtest.h"
-
-int main(int argc, char **argv)
-{
-	char prog[] = "igt_list_only";
-	char arg[] = "--list-subtests";
-	char *fake_argv[] = {prog, arg};
-	int fake_argc = 2;
-
-	igt_subtest_init(fake_argc, fake_argv);
-
-	igt_subtest("A")
-		;
-}
diff --git a/lib/tests/meson.build b/lib/tests/meson.build
index 665ad4a0fbcc..776b63ed1fd4 100644
--- a/lib/tests/meson.build
+++ b/lib/tests/meson.build
@@ -1,21 +1,20 @@
 lib_tests = [
-	'igt_fork_helper',
+	'igt_assert',
+	'igt_can_fail',
+	'igt_can_fail_simple',
+	'igt_exit_handler',
 	'igt_fork',
+	'igt_fork_helper',
+	'igt_hdmi_inject',
 	'igt_list_only',
+	'igt_no_exit',
+	'igt_segfault',
 	'igt_simulation',
 	'igt_stats',
-	'igt_segfault',
 	'igt_subtest_group',
-	'igt_assert',
-	'igt_exit_handler',
-	'igt_hdmi_inject',
-	'igt_can_fail',
-	'igt_can_fail_simple',
 ]
 
 lib_fail_tests = [
-	'igt_no_exit',
-	'igt_no_exit_list_only',
 	'igt_no_subtest',
 	'igt_simple_test_subtests',
 	'igt_timeout',
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev