From patchwork Mon Oct 9 12:27:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 13413700 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2086CE95A9A for ; Mon, 9 Oct 2023 12:43:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8576310E27A; Mon, 9 Oct 2023 12:43:46 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id D838A10E273; Mon, 9 Oct 2023 12:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696855424; x=1728391424; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FIF1EHjL7+Al2ztOFOGJaqOUf7ZtpUKJ9/ZVYFlgHv0=; b=A6AJ96WKGRATHbVpusu0HsJ19UKmGA7YU6aitEgKZsiU/loaDbPhnS80 ATzok/JrEf9Z3OUmWoalYdO52Vv1hRSYhRVFk9rlg6UzXzP0vWqMmiziY JL0pwsTB5HhOB5109rADQM4aLsfcmthW4XMvEO3sONdx5Xh8X42o9P6zd 3Yebfhm7n83lUmkXl2wEFSDUt8TfWUVoHlZY4ZYWeXTsuHt48kxr7IYKK 5+8zpY12unG2TJPztKFJLqgEkA+9w5Bpk8xopijtvB6ugDqk1tqFL6fKl 0NMim0bkhhc4l3enctBdF43Fu9sZCFXCqqxL070mG+x8eX3V6rvp/w6MD Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10858"; a="383010584" X-IronPort-AV: E=Sophos;i="6.03,210,1694761200"; d="scan'208";a="383010584" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2023 05:43:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10858"; a="823326881" X-IronPort-AV: E=Sophos;i="6.03,210,1694761200"; d="scan'208";a="823326881" Received: from jkrzyszt-mobl2.ger.corp.intel.com (HELO jkrzyszt-mobl2.intranet) ([10.213.16.68]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2023 05:43:42 -0700 From: Janusz Krzysztofik To: igt-dev@lists.freedesktop.org Date: Mon, 9 Oct 2023 14:27:58 +0200 Message-ID: <20231009122750.519112-20-janusz.krzysztofik@linux.intel.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231009122750.519112-13-janusz.krzysztofik@linux.intel.com> References: <20231009122750.519112-13-janusz.krzysztofik@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t v2 07/11] lib/ktap: Drop workaround for missing top level KTAP headers X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, Mauro Carvalho Chehab , intel-xe@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" A workaround was implemented in IGT KTAP parser so it could accepted KTAP reports with missing top level KTAP version and test suite plan headers. Since kernel side commit c95e7c05c139 ("kunit: Report the count of test suites in a module"), included in the mainline kernel since v6.6-rc1, has fixed that issue, that workaround is no longer needed. Drop it. Signed-off-by: Janusz Krzysztofik Reviewed-by: Kamil Konieczny --- lib/igt_ktap.c | 12 ------------ lib/tests/igt_ktap_parser.c | 3 +-- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/lib/igt_ktap.c b/lib/igt_ktap.c index 53a6c63288..7c52ba11ed 100644 --- a/lib/igt_ktap.c +++ b/lib/igt_ktap.c @@ -84,18 +84,6 @@ int igt_ktap_parse(const char *buf, struct igt_ktap_results *ktap) igt_debug_on(sscanf(buf, "%*1[ ]%*1[ ]%*1[ ]%*1[ ]KTAP%*[ ]version%*[ ]%u %n", &n, &len) == 1 && len == strlen(buf))) { - /* - * TODO: drop the following workaround as soon as - * kernel side issue of missing lines with top level - * KTAP version and test suite plan is fixed. - */ - if (ktap->expect == KTAP_START) { - ktap->suite_count = 1; - ktap->suite_last = 0; - ktap->suite_name = NULL; - ktap->expect = SUITE_START; - } - if (igt_debug_on(ktap->expect != SUITE_START)) return -EPROTO; diff --git a/lib/tests/igt_ktap_parser.c b/lib/tests/igt_ktap_parser.c index 6357bdf6a5..476e14092f 100644 --- a/lib/tests/igt_ktap_parser.c +++ b/lib/tests/igt_ktap_parser.c @@ -190,8 +190,7 @@ static void ktap_top_version(void) ktap = igt_ktap_alloc(&results); igt_require(ktap); - /* TODO: change to -EPROTO as soon as related workaround is dropped */ - igt_assert_eq(igt_ktap_parse(" KTAP version 1\n", ktap), -EINPROGRESS); + igt_assert_eq(igt_ktap_parse(" KTAP version 1\n", ktap), -EPROTO); igt_ktap_free(ktap); ktap = igt_ktap_alloc(&results);