[i-g-t,3/3] lib: ensure subtests are not added to simple tests

Commit Message

Thomas Wood Nov. 25, 2014, 4:26 p.m. UTC

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

Signed-off-by: Thomas Wood <[e-mail]>
---
 lib/igt_core.c                       |  1 +
 lib/tests/.gitignore                 |  1 +
 lib/tests/Makefile.sources           |  2 ++
 lib/tests/igt_simple_test_subtests.c | 31 +++++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 100644 lib/tests/igt_simple_test_subtests.c

Patch

diff --git a/lib/igt_core.c b/lib/igt_core.c
index b937f43..3fd4595 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -672,6 +672,7 @@  bool __igt_run_subtest(const char *subtest_name)
 {
 	assert(!in_subtest);
 	assert(!in_fixture);
+	assert(test_with_subtests);
 
 	if (list_subtests) {
 		printf("%s\n", subtest_name);
diff --git a/lib/tests/.gitignore b/lib/tests/.gitignore
index 9fd8580..907bd88 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 4208a26..828baa4 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 0000000..abe8e40
--- /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");
+	}
+}