lib: ensure subtests are not added to simple tests

Simple tests do not support subtests, so fail if igt_subtest is used in
one.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>

3 files changed, 34 insertions, 0 deletions

diff --git a/lib/tests/.gitignore b/lib/tests/.gitignore
index 9fd8580e..907bd880 100644
--- a/lib/tests/.gitignore
+++ b/lib/tests/.gitignore
@@ -5,4 +5,5 @@ igt_no_exit
 igt_no_exit_list_only
 igt_no_subtest
 igt_simulation
+igt_simple_test_subtests
 igt_timeout
diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources
index 4208a264..828baa4c 100644
--- a/lib/tests/Makefile.sources
+++ b/lib/tests/Makefile.sources
@@ -5,6 +5,7 @@ check_PROGRAMS = \
 	igt_list_only \
 	igt_no_subtest \
 	igt_simulation \
+	igt_simple_test_subtests \
 	igt_timeout \
 	$(NULL)
 
@@ -23,5 +24,6 @@ XFAIL_TESTS = \
 	igt_no_exit \
 	igt_no_exit_list_only \
 	igt_no_subtest \
+	igt_simple_test_subtests \
 	igt_timeout \
 	$(NULL)
diff --git a/lib/tests/igt_simple_test_subtests.c b/lib/tests/igt_simple_test_subtests.c
new file mode 100644
index 00000000..abe8e40a
--- /dev/null
+++ b/lib/tests/igt_simple_test_subtests.c
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2014 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.
+ */
+
+#include "igt_core.h"
+
+igt_simple_main
+{
+	igt_subtest("subtest") {
+		igt_info("Invalid subtest.\n");
+	}
+}