Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t v2] testplan/meson.build: only run igt_runner if it is compiled
@ 2023-04-04  7:08 Mauro Carvalho Chehab
  2023-04-04  9:51 ` [igt-dev] ✗ GitLab.Pipeline: warning for testplan/meson.build: only run igt_runner if it is compiled (rev2) Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2023-04-04  7:08 UTC (permalink / raw)
  To: igt-dev

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

While the runner is built by default, if jsonc is not found, it
won't be build. This will cause the documentation validation test
to cause the build to fail.

Prevent that by adding an extra check if jsonc is found, as this
is the same condition that it is used to build igt_runner.

While here, also ensure that igt_doc.py will depend on having the
igt_runner already compiled, when the --check option is used.

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---

v2:
  - add a dependency for the runner binary when --check option is
    used.

 docs/testplan/meson.build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/testplan/meson.build b/docs/testplan/meson.build
index 4c67ec42fc69..b8f94f1d74fb 100644
--- a/docs/testplan/meson.build
+++ b/docs/testplan/meson.build
@@ -9,9 +9,11 @@ stylesheet = join_paths(meson.current_source_dir(), 'testplan.css')
 xe_test_config = join_paths(source_root, 'tests', 'xe', 'xe_test_config.json')
 
 check_testlist = []
-if build_tests
+doc_dependencies = test_executables
+if build_tests and jsonc.found()
 	# Check if documentation matches the actual tests
 	check_testlist = [ '--check-testlist', '--igt-build-path', build_root ]
+	doc_dependencies += runner
 else
 	test_executables = []
 endif
@@ -24,7 +26,7 @@ foreach testplan, fields: test_dict
 	rst = custom_target(testplan + '.rst',
 			    build_by_default : true,
 			    command : [ igt_doc_script, '--config', '@INPUT@', '--rest', '@OUTPUT@' ] + fields['extra_args'],
-			    depends : test_executables,
+			    depends : doc_dependencies,
 			    input : fields['input'],
 			    output : testplan + '.rst'
 			   )
-- 
2.39.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-04 15:57 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-04  7:08 [igt-dev] [PATCH i-g-t v2] testplan/meson.build: only run igt_runner if it is compiled Mauro Carvalho Chehab
2023-04-04  9:51 ` [igt-dev] ✗ GitLab.Pipeline: warning for testplan/meson.build: only run igt_runner if it is compiled (rev2) Patchwork
2023-04-04 10:13 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2023-04-04 15:57 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox