lib: Add igt_subtest_group

Useful for creating common setup code in igt_fixture which is only
needed by a subset of tests. And since I'm a good citizen it comes
with a library testcase/example included.

v2: Make testcase nastier to ensure a subtest group SKIPS when it's
parent is skipping already. I accidentally got this right, but let's
make sure.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

3 files changed, 65 insertions, 0 deletions

diff --git a/lib/tests/.gitignore b/lib/tests/.gitignore
index 661386a3..842482c0 100644
--- a/lib/tests/.gitignore
+++ b/lib/tests/.gitignore
@@ -11,4 +11,5 @@ igt_segfault
 igt_simple_test_subtests
 igt_simulation
 igt_stats
+igt_subtest_group
 igt_timeout
diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources
index 09baeb12..707c445a 100644
--- a/lib/tests/Makefile.sources
+++ b/lib/tests/Makefile.sources
@@ -10,6 +10,7 @@ check_PROGRAMS = \
 	igt_timeout \
 	igt_invalid_subtest_name \
 	igt_segfault \
+	igt_subtest_group \
 	igt_assert \
 	igt_exit_handler \
 	$(NULL)
diff --git a/lib/tests/igt_subtest_group.c b/lib/tests/igt_subtest_group.c
new file mode 100644
index 00000000..2b17955c
--- /dev/null
+++ b/lib/tests/igt_subtest_group.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2016 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 <assert.h>
+#include "igt_core.h"
+
+igt_main
+{
+	bool t1 = false;
+
+	igt_subtest_group {
+		igt_fixture {
+			igt_require(true);
+		}
+
+		igt_subtest_group {
+			igt_fixture {
+				igt_require(false);
+			}
+
+			igt_subtest("not-run") {
+				assert(0);
+			}
+
+			igt_subtest_group {
+				/* need to make sure we don't accidentally
+				 * restore to "run testcases" when an outer
+				 * group is already in SKIP state. */
+				igt_subtest("still-not-run") {
+					assert(0);
+				}
+			}
+		}
+
+		igt_subtest("run") {
+			t1 = true;
+			assert(1);
+		}
+	}
+
+	assert(t1);
+}