From patchwork Fri Jun 12 10:05:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Derek Morton X-Patchwork-Id: 6597301 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4CC75C0020 for ; Fri, 12 Jun 2015 10:12:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E313205EF for ; Fri, 12 Jun 2015 10:12:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 15405205EB for ; Fri, 12 Jun 2015 10:12:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48EA76EA80; Fri, 12 Jun 2015 03:12:40 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 89F8F6EA80 for ; Fri, 12 Jun 2015 03:12:39 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 12 Jun 2015 03:05:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,601,1427785200"; d="scan'208";a="507152400" Received: from djmorton-linux.isw.intel.com ([10.102.226.153]) by FMSMGA003.fm.intel.com with ESMTP; 12 Jun 2015 03:05:30 -0700 From: Derek Morton To: intel-gfx@lists.freedesktop.org Date: Fri, 12 Jun 2015 11:05:18 +0100 Message-Id: <1434103518-1734-1-git-send-email-derek.j.morton@intel.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Cc: thomas.wood@intel.com Subject: [Intel-gfx] [PATCH i-g-t v4] lib/tests/igt_segfault Add unit test to test segfault handling X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Unit test to check a segfaulting subtest is handled correctly. v2: Added script to check subtest results v3: Removed script. Updated test to use fork to monitor return status. v4: Added igt_segfault to .gitignore Signed-off-by: Derek Morton --- lib/tests/.gitignore | 1 + lib/tests/Makefile.sources | 1 + lib/tests/igt_segfault.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 lib/tests/igt_segfault.c diff --git a/lib/tests/.gitignore b/lib/tests/.gitignore index a745a23..729568b 100644 --- a/lib/tests/.gitignore +++ b/lib/tests/.gitignore @@ -5,6 +5,7 @@ igt_list_only igt_no_exit igt_no_exit_list_only igt_no_subtest +igt_segfault igt_simple_test_subtests igt_simulation igt_timeout diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources index 10e0617..5fa0b31 100644 --- a/lib/tests/Makefile.sources +++ b/lib/tests/Makefile.sources @@ -8,6 +8,7 @@ check_PROGRAMS = \ igt_simple_test_subtests \ igt_timeout \ igt_invalid_subtest_name \ + igt_segfault \ $(NULL) check_SCRIPTS = \ diff --git a/lib/tests/igt_segfault.c b/lib/tests/igt_segfault.c new file mode 100644 index 0000000..b420b1a --- /dev/null +++ b/lib/tests/igt_segfault.c @@ -0,0 +1,139 @@ +/* + * 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. + * + * Authors: + * Derek Morton + * + */ + +/* + * Testcase: Test the framework catches a segfault and returns an error. + * + * 1. Test a crashing simple test is reported. + * 2. Test a crashing subtest is reported. + * 3. Test a crashing subtest following a passing subtest is reported. + * 4. Test a crashing subtest preceeding a passing subtest is reported. + */ + +#include +#include +#include +#include +#include + +#include "drmtest.h" +#include "igt_core.h" + +/* + * We need to hide assert from the cocci igt test refactor spatch. + * + * IMPORTANT: Test infrastructure tests are the only valid places where using + * assert is allowed. + */ +#define internal_assert assert + +bool simple; +bool runa; +bool runc; +char test[] = "test"; +char *argv_run[] = { test }; + +static int do_fork(void) +{ + int pid, status; + int argc; + void (*crashme)(void) = NULL; + + switch (pid = fork()) { + case -1: + internal_assert(0); + case 0: + if (simple) { + argc = 1; + igt_simple_init(argc, argv_run); + crashme(); + + igt_exit(); + } else { + + argc = 1; + igt_subtest_init(argc, argv_run); + + if(runa) + igt_subtest("A") + ; + + igt_subtest("B") + crashme(); + + if(runc) + igt_subtest("C") + ; + + igt_exit(); + } + default: + while (waitpid(pid, &status, 0) == -1 && + errno == EINTR) + ; + + if(WIFSIGNALED(status)) + return WTERMSIG(status) + 128; + + return WEXITSTATUS(status); + } +} + +int main(int argc, char **argv) +{ + /* Test Crash in simple test is reported */ + simple = true; + runa=false; + runc=false; + igt_info("Simple test.\n"); + fflush(stdout); + internal_assert(do_fork() == SIGSEGV + 128); + + /* Test crash in a single subtest is reported */ + simple = false; + igt_info("Single subtest.\n"); + fflush(stdout); + internal_assert(do_fork() == SIGSEGV + 128); + + /* Test crash in a subtest following a pass is reported */ + simple = false; + runa=true; + igt_info("Passing then crashing subtest.\n"); + fflush(stdout); + internal_assert(do_fork() == SIGSEGV + 128); + + /* Test crash in a subtest preceeding a pass is reported */ + simple = false; + runa=false; + runc=true; + igt_info("Crashing then passing subtest.\n"); + fflush(stdout); + internal_assert(do_fork() == SIGSEGV + 128); + + return 0; +} +