From patchwork Tue Nov 25 16:26:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 5380691 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DBAF59F3D0 for ; Tue, 25 Nov 2014 16:26:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 344B2200DE for ; Tue, 25 Nov 2014 16:26:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C0C6720114 for ; Tue, 25 Nov 2014 16:26:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 606616E95D; Tue, 25 Nov 2014 08:26:46 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 143A26E95D for ; Tue, 25 Nov 2014 08:26:45 -0800 (PST) Received: by mail-wi0-f171.google.com with SMTP id bs8so9710431wib.4 for ; Tue, 25 Nov 2014 08:26:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=wuKHxf/u/TJKeJvOWi2D50L75DlGkJBtIzQj1qJ8buA=; b=h5xZ3RD4nXvAoOWMnftOI6rmdhFj3Pvjokvxc5DKoIcCYeaVSkNl/ZLBjnkiJKp42T /2fn/XqCsB37nk68nybk/Rre2ZavrGsMxaVdwuC27u4nADMO61cKqn5eocg4GZ4UD94A AX55jHj5OUcj9m5Mn3ytYAJh8q1WyxclgVEQNAIpVIr/yrIQJeLw13xUdwUngtGz9kzS xEQLPBhzW4ySoXZuKRiJt5TjqWGytgPONqLFIRLaiBrWaZIql9DSYjLXJYXWIDdilSZb 2fYuDjG9v5Moymoot/AnGwPB92YibWSLjitdV068JrlvserSHX8nSDn1w1CJt1dUsppb NKSQ== X-Gm-Message-State: ALoCoQmPa8hNo2tgGWS/6vqLd+/HX2iP67RoJrpBkAMIlj9Zz4SzBEvf0fvRZqKy60R6+rXWm1jn X-Received: by 10.180.91.70 with SMTP id cc6mr34134634wib.5.1416932802865; Tue, 25 Nov 2014 08:26:42 -0800 (PST) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id jp3sm17123297wid.9.2014.11.25.08.26.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Nov 2014 08:26:42 -0800 (PST) From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Tue, 25 Nov 2014 16:26:26 +0000 Message-Id: <1416932786-8000-3-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1416932786-8000-1-git-send-email-thomas.wood@intel.com> References: <1416932786-8000-1-git-send-email-thomas.wood@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 3/3] lib: ensure subtests are not added to simple tests 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 Simple tests do not support subtests, so fail if igt_subtest is used in one. Signed-off-by: Thomas Wood --- lib/igt_core.c | 1 + lib/tests/.gitignore | 1 + lib/tests/Makefile.sources | 2 ++ lib/tests/igt_simple_test_subtests.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 lib/tests/igt_simple_test_subtests.c diff --git a/lib/igt_core.c b/lib/igt_core.c index b937f43..3fd4595 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -672,6 +672,7 @@ bool __igt_run_subtest(const char *subtest_name) { assert(!in_subtest); assert(!in_fixture); + assert(test_with_subtests); if (list_subtests) { printf("%s\n", subtest_name); diff --git a/lib/tests/.gitignore b/lib/tests/.gitignore index 9fd8580..907bd88 100644 --- a/lib/tests/.gitignore +++ b/lib/tests/.gitignore @@ -5,4 +5,5 @@ igt_no_exit igt_no_exit_list_only igt_no_subtest igt_simulation +igt_simple_test_subtests igt_timeout diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources index 4208a26..828baa4 100644 --- a/lib/tests/Makefile.sources +++ b/lib/tests/Makefile.sources @@ -5,6 +5,7 @@ check_PROGRAMS = \ igt_list_only \ igt_no_subtest \ igt_simulation \ + igt_simple_test_subtests \ igt_timeout \ $(NULL) @@ -23,5 +24,6 @@ XFAIL_TESTS = \ igt_no_exit \ igt_no_exit_list_only \ igt_no_subtest \ + igt_simple_test_subtests \ igt_timeout \ $(NULL) diff --git a/lib/tests/igt_simple_test_subtests.c b/lib/tests/igt_simple_test_subtests.c new file mode 100644 index 0000000..abe8e40 --- /dev/null +++ b/lib/tests/igt_simple_test_subtests.c @@ -0,0 +1,31 @@ +/* + * Copyright © 2014 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_simple_main +{ + igt_subtest("subtest") { + igt_info("Invalid subtest.\n"); + } +}