From 741bf7064c467df725c14cc0b3b8b50436f9ee09 Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Thu, 18 Oct 2018 14:06:42 +0300 Subject: tests: Introduce i915 directory We can already move all the tests with distinct prefixes: gem_, gen3_ and i915_. pm_ and drv_ tests will follow in batches, so we can do the adjustments in the reporting/filtering layer of the CI system. v2: Fix test-list.txt generation with meson v3: Fix docs build (Petri) Cc: Chris Wilson Cc: Petri Latvala Cc: Martin Peres Signed-off-by: Arkadiusz Hiler Reviewed-by: Petri Latvala Tested-by: Petri Latvala Acked-by: Daniel Vetter Acked-by: Chris Wilson --- docs/reference/igt-gpu-tools/meson.build | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build index ebcb6b7a..e544e71b 100644 --- a/docs/reference/igt-gpu-tools/meson.build +++ b/docs/reference/igt-gpu-tools/meson.build @@ -48,8 +48,6 @@ test_groups = [ gen_description = find_program('generate_description_xml.sh') gen_programs = find_program('generate_programs_xml.sh') -test_list_files = [] - generated_docs = [] configure_file(input: 'version.xml.in', @@ -61,13 +59,13 @@ if meson.version().version_compare('>= 0.47') programs_xml = 'igt_test_programs_' + group + '_programs.xml' generated_docs += custom_target(programs_xml, output : programs_xml, - command : [ gen_programs, '@OUTPUT@', group, test_list ]) + command : [ gen_programs, '@OUTPUT@', group, test_list_target ]) description_xml = 'igt_test_programs_' + group + '_description.xml' generated_docs += custom_target(description_xml, output : description_xml, depends : test_executables, - command : [ gen_description, '@OUTPUT@', group, test_list ]) + command : [ gen_description, '@OUTPUT@', group, test_list_target ]) endforeach else # older meson needs the build_by_default hack because gtkdoc dependency @@ -77,14 +75,14 @@ else custom_target(programs_xml, build_by_default : true, output : programs_xml, - command : [ gen_programs, '@OUTPUT@', group, test_list ]) + command : [ gen_programs, '@OUTPUT@', group, test_list_target ]) description_xml = 'igt_test_programs_' + group + '_description.xml' custom_target(description_xml, build_by_default : true, output : description_xml, depends : test_executables, - command : [ gen_description, '@OUTPUT@', group, test_list ]) + command : [ gen_description, '@OUTPUT@', group, test_list_target ]) endforeach endif -- cgit v1.2.3