Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 1/2] testplan/meson.build: disable kms check testlist if not chamelium
Date: Tue, 10 Oct 2023 15:17:19 +0200	[thread overview]
Message-ID: <20231010131743.535504-2-mauro.chehab@linux.intel.com> (raw)
In-Reply-To: <20231010131743.535504-1-mauro.chehab@linux.intel.com>

From: Mauro Carvalho Chehab <mchehab@kernel.org>

The KMS JSON file contains some tests that can optionally be disabled.
When those are disabled, the code can't check for missing documents,
as the JSON file specifies both enabled and disabled tests.

Detect that to avoid build problems.

While here, remove a left-over dictionary (xe_test_dict).

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
 docs/testplan/meson.build | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/testplan/meson.build b/docs/testplan/meson.build
index 16dd578266cd..9e0c3aee06af 100644
--- a/docs/testplan/meson.build
+++ b/docs/testplan/meson.build
@@ -11,12 +11,19 @@ kms_test_config = join_paths(source_root, 'tests', 'intel', 'kms_test_config.jso
 i915_test_config = join_paths(source_root, 'tests', 'intel', 'i915_test_config.json')
 
 check_testlist = []
+kms_check_testlist = []
 if build_tests
 	doc_dependencies = testlist_files
 	# Check if documentation matches the actual tests and tests can run
 	if not meson.is_cross_build()
 		build_info += 'Will Check if documentation is in sync with testlist'
 		check_testlist = [ '--check-testlist', '--igt-build-path', build_root ]
+
+		if not chamelium.found()
+			warning('WARNING: Will not check if documentation is in sync for KMS as chamelium is disabled')
+		else
+			kms_check_testlist = check_testlist
+		endif
 	else
 		warning('WARNING: Will not check if documentation is in sync with testlist')
 	endif
@@ -24,20 +31,16 @@ else
 	doc_dependencies = []
 endif
 
-xe_test_dict = {
-		 'xe_tests': { 'input': xe_test_config, 'extra_args': check_testlist }
-	       }
-
 if build_xe
 	test_dict = {
 		'i915_tests': { 'input': i915_test_config, 'extra_args': check_testlist },
-		'kms_tests': { 'input': kms_test_config, 'extra_args': check_testlist },
+		'kms_tests': { 'input': kms_test_config, 'extra_args': kms_check_testlist },
 		'xe_tests': { 'input': xe_test_config, 'extra_args': check_testlist }
 	    }
 else
 	test_dict = {
 	      'i915_tests': { 'input': i915_test_config, 'extra_args': check_testlist },
-	      'kms_tests': { 'input': kms_test_config, 'extra_args': check_testlist }
+	      'kms_tests': { 'input': kms_test_config, 'extra_args': kms_check_testlist }
 	    }
 endif
 
-- 
2.41.0

  reply	other threads:[~2023-10-10 13:17 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-10 13:17 [igt-dev] [PATCH i-g-t 0/2] Properly fix compilation breakage when Chamelium is disabled Mauro Carvalho Chehab
2023-10-10 13:17 ` Mauro Carvalho Chehab [this message]
2023-10-10 14:59   ` [igt-dev] [PATCH i-g-t 1/2] testplan/meson.build: disable kms check testlist if not chamelium Kamil Konieczny
2023-10-10 13:17 ` [igt-dev] [PATCH i-g-t 2/2] scripts/test_list.py: fix and simplify missing doc check Mauro Carvalho Chehab
2023-10-10 15:15   ` Kamil Konieczny
2023-10-10 17:56 ` [igt-dev] ✗ Fi.CI.BAT: failure for Properly fix compilation breakage when Chamelium is disabled Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231010131743.535504-2-mauro.chehab@linux.intel.com \
    --to=mauro.chehab@linux.intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox