Commit 741bf706 authored by Arkadiusz Hiler's avatar Arkadiusz Hiler

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 <chris@chris-wilson.co.uk>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Martin Peres <martin.peres@linux.intel.com>
Signed-off-by: Arkadiusz Hiler's avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala's avatarPetri Latvala <petri.latvala@intel.com>
Tested-by: Petri Latvala's avatarPetri Latvala <petri.latvala@intel.com>
Acked-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Chris Wilson's avatarChris Wilson <chris@chris-wilson.co.uk>
parent 78619fde
......@@ -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
......
......@@ -46,11 +46,13 @@ noinst_PROGRAMS = \
$(NULL)
pkglibexec_PROGRAMS = \
gem_stress \
$(TESTS_progs) \
$(TESTS_progs_X) \
$(NULL)
pkglibexec_PROGRAMS += gem_stress
gem_stress_SOURCES = i915/gem_stress.c
# Piglit expects test-list*.txt to be in the same directory as the
# tests. pkglibexec_DATA is an invalid combo to autotools, so work
# around that by defining a new directory variable that is the same as
......
This diff is collapsed.
......@@ -15,5 +15,5 @@ foreach prog : amdgpu_progs
install_dir : amdgpudir,
install_rpath : amdgpudir_rpathdir,
install : true)
test_progs += join_paths('amdgpu', prog)
test_list += join_paths('amdgpu', prog)
endforeach
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment