[PATCH i-g-t 1/2] lib/tests: verify subtest enumeration output

[PATCH i-g-t 1/2] lib/tests: verify subtest enumeration output

[Thomas Wood]

Check that the subtest list is not empty if using --list-subtests
returns with an exit code of 0, and that the list is empty if it returns
with 79.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
 lib/tests/igt_command_line.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/tests/igt_command_line.sh b/lib/tests/igt_command_line.sh
index 5cf2584..a057943 100755
--- a/lib/tests/igt_command_line.sh
+++ b/lib/tests/igt_command_line.sh
@@ -56,8 +56,17 @@ for test in $TESTLIST; do
 
 	# check --list-subtests works correctly
 	echo "  Checking subtest enumeration..."
-	./$test --list-subtests > /dev/null
-	if [ $? -ne 0 -a $? -ne 79 ]; then
+	LIST=`./$test --list-subtests`
+	RET=$?
+	if [ $RET -ne 0 -a $RET -ne 79 ]; then
+		exit 1
+	fi
+
+	if [ $RET -eq 79 -a -n "$LIST" ]; then
+		exit 1
+	fi
+
+	if [ $RET -eq 0 -a -z "$LIST" ]; then
 		exit 1
 	fi
 
-- 
2.1.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH i-g-t 2/2] lib/tests: check that invalid subtest names are rejected

[Thomas Wood]

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
---
 lib/tests/Makefile.sources           |  2 ++
 lib/tests/igt_invalid_subtest_name.c | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 lib/tests/igt_invalid_subtest_name.c

diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources
index 828baa4..ecd73ae 100644
--- a/lib/tests/Makefile.sources
+++ b/lib/tests/Makefile.sources
@@ -7,6 +7,7 @@ check_PROGRAMS = \
 	igt_simulation \
 	igt_simple_test_subtests \
 	igt_timeout \
+	igt_invalid_subtest_name \
 	$(NULL)
 
 check_SCRIPTS = \
@@ -26,4 +27,5 @@ XFAIL_TESTS = \
 	igt_no_subtest \
 	igt_simple_test_subtests \
 	igt_timeout \
+	igt_invalid_subtest_name \
 	$(NULL)
diff --git a/lib/tests/igt_invalid_subtest_name.c b/lib/tests/igt_invalid_subtest_name.c
new file mode 100644
index 0000000..418071d
--- /dev/null
+++ b/lib/tests/igt_invalid_subtest_name.c
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2015 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_main
+{
+	igt_subtest("# invalid name !") {
+		igt_info("Invalid subtest name test\n");
+	}
+}
-- 
2.1.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx