From patchwork Tue Oct 20 21:22:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zanoni, Paulo R" X-Patchwork-Id: 7450561 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 14DDA9F302 for ; Tue, 20 Oct 2015 21:23:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B9EA2086D for ; Tue, 20 Oct 2015 21:22:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2C01520800 for ; Tue, 20 Oct 2015 21:22:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B68472210; Tue, 20 Oct 2015 14:22:57 -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 74F3C721C7 for ; Tue, 20 Oct 2015 14:22:54 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 20 Oct 2015 14:22:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,708,1437462000"; d="scan'208";a="831572765" Received: from rehlert-mobl1.amr.corp.intel.com (HELO panetone.amr.corp.intel.com) ([10.252.197.226]) by fmsmga002.fm.intel.com with ESMTP; 20 Oct 2015 14:22:39 -0700 From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Tue, 20 Oct 2015 19:22:19 -0200 Message-Id: <1445376139-14817-4-git-send-email-paulo.r.zanoni@intel.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445376139-14817-1-git-send-email-paulo.r.zanoni@intel.com> References: <1445349004-16409-1-git-send-email-paulo.r.zanoni@intel.com> <1445376139-14817-1-git-send-email-paulo.r.zanoni@intel.com> Subject: [Intel-gfx] [PATCH igt 4/4] kms_frontbuffer_tracking: remove opt.only_feature 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: , MIME-Version: 1.0 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, 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 That option is not needed anymore since: commit 982934625ac67234c6d85c6cf29a5a487e54d4f0 Author: Thomas Wood Date: Wed Sep 16 14:36:24 2015 +0100 lib: allow wildcard matching when specifying subtests In fact, using "--run-subtest 'fbc-*'" is better than using --fbc-only due to how SKIPs are handled. In the former, only the tests matching the expression are tried, so the number of SKIPs only contains the number of tests on the specified pattern that were skipped. If you used --fbc-only, all the non-fbc tests would count as SKIPs, so it would be harder to know which of the tests marked as skipped were actual FBC tests. Signed-off-by: Paulo Zanoni --- tests/kms_frontbuffer_tracking.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index e183a06..15707b9 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -239,7 +239,6 @@ struct { bool small_modes; bool show_hidden; int step; - int only_feature; int only_pipes; int shared_fb_x_offset; int shared_fb_y_offset; @@ -252,7 +251,6 @@ struct { .small_modes = false, .show_hidden= false, .step = 0, - .only_feature = FEATURE_COUNT, .only_pipes = PIPE_COUNT, .shared_fb_x_offset = 500, .shared_fb_y_offset = 500, @@ -1727,9 +1725,6 @@ static void check_test_requirements(const struct test_mode *t) "Can't test PSR without sink CRCs\n"); } - if (opt.only_feature != FEATURE_COUNT) - igt_require(t->feature == opt.only_feature); - if (opt.only_pipes != PIPE_COUNT) igt_require(t->pipes == opt.only_pipes); } @@ -2944,18 +2939,6 @@ static int opt_handler(int option, int option_index, void *data) case 't': opt.step++; break; - case 'n': - igt_assert(opt.only_feature == FEATURE_COUNT); - opt.only_feature = FEATURE_NONE; - break; - case 'f': - igt_assert(opt.only_feature == FEATURE_COUNT); - opt.only_feature = FEATURE_FBC; - break; - case 'p': - igt_assert(opt.only_feature == FEATURE_COUNT); - opt.only_feature = FEATURE_PSR; - break; case 'x': errno = 0; opt.shared_fb_x_offset = strtol(optarg, NULL, 0); @@ -2990,9 +2973,6 @@ const char *help_str = " --use-small-modes Use smaller resolutions for the modes\n" " --show-hidden Show hidden subtests\n" " --step Stop on each step so you can check the screen\n" -" --nop-only Only run the \"nop\" feature subtests\n" -" --fbc-only Only run the \"fbc\" feature subtests\n" -" --psr-only Only run the \"psr\" feature subtests\n" " --shared-fb-x offset Use 'offset' as the X offset for the shared FB\n" " --shared-fb-y offset Use 'offset' as the Y offset for the shared FB\n" " --1p-only Only run subtests that use 1 pipe\n" @@ -3095,8 +3075,7 @@ static const char *format_str(enum pixel_format format) if (!opt.show_hidden && t.pipes == PIPE_DUAL && \ t.screen == SCREEN_OFFSCREEN) \ continue; \ - if ((!opt.show_hidden && opt.only_feature != FEATURE_NONE) \ - && t.feature == FEATURE_NONE) \ + if (!opt.show_hidden && t.feature == FEATURE_NONE) \ continue; \ if (!opt.show_hidden && t.fbs == FBS_SHARED && \ (t.plane == PLANE_CUR || t.plane == PLANE_SPR)) \ @@ -3117,9 +3096,6 @@ int main(int argc, char *argv[]) { "use-small-modes", 0, 0, 'm'}, { "show-hidden", 0, 0, 'i'}, { "step", 0, 0, 't'}, - { "nop-only", 0, 0, 'n'}, - { "fbc-only", 0, 0, 'f'}, - { "psr-only", 0, 0, 'p'}, { "shared-fb-x", 1, 0, 'x'}, { "shared-fb-y", 1, 0, 'y'}, { "1p-only", 0, 0, '1'}, @@ -3134,8 +3110,7 @@ int main(int argc, char *argv[]) setup_environment(); for (t.feature = 0; t.feature < FEATURE_COUNT; t.feature++) { - if ((!opt.show_hidden && opt.only_feature != FEATURE_NONE) - && t.feature == FEATURE_NONE) + if (!opt.show_hidden && t.feature == FEATURE_NONE) continue; for (t.pipes = 0; t.pipes < PIPE_COUNT; t.pipes++) { t.screen = SCREEN_PRIM;