aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLi-Wen Hsu <lwhsu@FreeBSD.org>2020-10-06 06:45:52 +0000
committerLi-Wen Hsu <lwhsu@FreeBSD.org>2020-10-06 06:45:52 +0000
commit194d5628721f6a306aa94f7e33be909f1ab16b49 (patch)
treeeba47dc2fe831cfb837e39be6b194bc7d33c4944 /tests
parent7862a433e947a78b44bce80bb7e00eeb44d752cd (diff)
downloadsrc-194d5628721f6a306aa94f7e33be909f1ab16b49.tar.gz
src-194d5628721f6a306aa94f7e33be909f1ab16b49.zip
Make capsicum test cases fine-grained
Add a wrapping script to use ATF to run tests written with Googletest one by one. This helps locating and tracking the failing case in CI easier. This is a temporarily solution while Googletest support in Kyua is developing. We will revert this once Kyua+Googletest integration is ready. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D25896
Notes
Notes: svn path=/head/; revision=366470
Diffstat (limited to 'tests')
-rw-r--r--tests/sys/capsicum/Makefile3
-rwxr-xr-xtests/sys/capsicum/functional.sh68
2 files changed, 70 insertions, 1 deletions
diff --git a/tests/sys/capsicum/Makefile b/tests/sys/capsicum/Makefile
index 1b46f9acb471..75dd0238895f 100644
--- a/tests/sys/capsicum/Makefile
+++ b/tests/sys/capsicum/Makefile
@@ -14,6 +14,7 @@ CFLAGS+= -I${SRCTOP}/tests
.PATH: ${SRCTOP}/contrib/capsicum-test
GTESTS+= capsicum-test
+GTESTS_WRAPPER_SH.capsicum-test= functional
SRCS.capsicum-test+= \
capsicum-test-main.cc \
@@ -50,6 +51,6 @@ BINMODE.mini-me.setuid= 4555
WARNS.capsicum-test= 3
-.endif
+.endif # MK_GOOGLETEST
.include <bsd.test.mk>
diff --git a/tests/sys/capsicum/functional.sh b/tests/sys/capsicum/functional.sh
new file mode 100755
index 000000000000..3d0a5a9a4935
--- /dev/null
+++ b/tests/sys/capsicum/functional.sh
@@ -0,0 +1,68 @@
+#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2020 The FreeBSD Foundation
+#
+# This software was developed by Li-Wen Hsu <lwhsu@FreeBSD.org>
+# under sponsorship from the FreeBSD Foundation.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+SRCDIR=$(atf_get_srcdir)
+CAPSICUM_TEST_BIN=capsicum-test
+
+check()
+{
+ local tc=${1}
+
+ atf_check -s exit:0 -o match:PASSED -e ignore \
+ ${SRCDIR}/${CAPSICUM_TEST_BIN} --gtest_filter=${tc}
+}
+
+add_testcase()
+{
+ local tc=${1}
+ local tc_escaped word
+
+ tc_escaped=$(echo ${tc} | sed -e 's/\./__/')
+
+ atf_test_case ${tc_escaped}
+ eval "${tc_escaped}_body() { check ${tc}; }"
+ atf_add_test_case ${tc_escaped}
+}
+
+list_tests()
+{
+ ${SRCDIR}/${CAPSICUM_TEST_BIN} --gtest_list_tests | awk '
+ /^[^ ]/ { CAT=$0 }
+ /^[ ]/ { print CAT $1}'
+}
+
+atf_init_test_cases()
+{
+ local t
+ for t in `list_tests`; do
+ add_testcase $t
+ done
+}