Skip to content
Snippets Groups Projects
Commit dd908267 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

testplan/meson.build: disable kms check testlist if not chamelium


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).

Reviewed-by: default avatarKamil Konieczny <kamil.konieczny@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 37709f27
No related branches found
No related tags found
Loading
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment