From mboxrd@z Thu Jan 1 00:00:00 1970 From: Derek Morton Subject: [PATCH i-g-t v2] lib/tests/igt_segfault.c Add unit test to test segfault handling Date: Wed, 27 May 2015 10:34:26 +0100 Message-ID: <1432719266-6474-1-git-send-email-derek.j.morton@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0549239490==" Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id D8CDC6E5E2 for ; Wed, 27 May 2015 02:34:31 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: thomas.wood@intel.com List-Id: intel-gfx@lists.freedesktop.org --===============0549239490== Content-Type: text/plain; charset=y Content-Transfer-Encoding: quoted-printable Unit test to check a segfaulting subtest is handled correctly. v2: Added script to check subtest results Signed-off-by: Derek Morton --- lib/tests/Makefile.sources | 3 ++ lib/tests/igt_segfault.c | 57 +++++++++++++++++++++++++++++++++++= +++ lib/tests/igt_segfault_check.sh | 61 +++++++++++++++++++++++++++++++++++= ++++++ 3 files changed, 121 insertions(+) create mode 100644 lib/tests/igt_segfault.c create mode 100755 lib/tests/igt_segfault_check.sh diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources index 10e0617..5e601fe 100644 --- a/lib/tests/Makefile.sources +++ b/lib/tests/Makefile.sources @@ -8,10 +8,12 @@ check_PROGRAMS =3D \ igt_simple_test_subtests \ igt_timeout \ igt_invalid_subtest_name \ + igt_segfault \ $(NULL) =20 check_SCRIPTS =3D \ igt_command_line.sh \ + igt_segfault_check.sh \ $(NULL) =20 TESTS =3D \ @@ -29,4 +31,5 @@ XFAIL_TESTS =3D \ igt_simple_test_subtests \ igt_timeout \ igt_invalid_subtest_name \ + igt_segfault \ $(NULL) diff --git a/lib/tests/igt_segfault.c b/lib/tests/igt_segfault.c new file mode 100644 index 0000000..19bb3c2 --- /dev/null +++ b/lib/tests/igt_segfault.c @@ -0,0 +1,57 @@ +/* + * Copyright =C2=A9 2015 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining= a + * copy of this software and associated documentation files (the "Softwa= re"), + * to deal in the Software without restriction, including without limita= tion + * the rights to use, copy, modify, merge, publish, distribute, sublicen= se, + * 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, EXPRE= SS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILI= TY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SH= ALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR = OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISI= NG + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER D= EALINGS + * IN THE SOFTWARE. + * + * Authors: + * Derek Morton + * + */ + +/* + * + * Testcase: Test the framework catches a segfault and returns an error. + * + * The test consists of three subtests. The first and third should pass + * while the second should cause a segfault. + * The overall result should be a failure with two subtests passing. + * + */ + +#include "drmtest.h" + +igt_main +{ + void (*crashme)(void) =3D NULL; + + igt_subtest("A") { + igt_info("Simple passing subtest.\n"); + } + + igt_subtest("B") { + igt_info("Cause a segfault.\n"); + crashme(); + } + + igt_subtest("C") { + igt_info("2nd Simple passing subtest.\n"); + } +} + diff --git a/lib/tests/igt_segfault_check.sh b/lib/tests/igt_segfault_che= ck.sh new file mode 100755 index 0000000..89d0c94 --- /dev/null +++ b/lib/tests/igt_segfault_check.sh @@ -0,0 +1,61 @@ +#!/bin/bash +# +# Copyright =C2=A9 2015 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining = a +# copy of this software and associated documentation files (the "Softwar= e"), +# to deal in the Software without restriction, including without limitat= ion +# the rights to use, copy, modify, merge, publish, distribute, sublicens= e, +# 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 n= ext +# paragraph) shall be included in all copies or substantial portions of = the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRES= S OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILIT= Y, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHA= LL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR O= THER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISIN= G +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DE= ALINGS +# IN THE SOFTWARE. +# +# Authors: +# Derek Morton +# + +# +# Testcase: Test the subtest results of igt_segfault. +# + +if [ -x "$top_builddir/tests/igt_segfault" ]; then + OP=3D$($top_builddir/tests/igt_segfault) + A_MATCH=3D'Subtest A: SUCCESS' + B_MATCH=3D'Subtest B: CRASH' + C_MATCH=3D'Subtest C: SUCCESS' + RESULT=3D'Failed : 1' + + if [[ $OP =3D=3D *"$A_MATCH"* ]]; then + if [[ $OP =3D=3D *"$B_MATCH"* ]]; then + if [[ $OP =3D=3D *"$C_MATCH"* ]]; then + if [[ $OP =3D=3D *"$RESULT"* ]]; then + echo "igt_segfault_check Passed" + exit 0 + else + echo "Overall result not Failed" + fi + else + echo "Subtest C not SUCCESS" + fi + else + echo "Subtest B not CRASH" + fi + else + echo "Subtest A not SUCCESS" + fi +else + echo "$top_builddir/tests/igt_segfault is not executable" +fi + +exit 99 --=20 1.9.1 --===============0549239490== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK --===============0549239490==--