AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel: Build mi_builder_test whenever build-tests is set

Browse Source 
Previously `install-intel-gpu-tests` controlled this, but now
`install-intel-gpu-tests` will only be used to decide if it should be
installed.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16902>
This commit is contained in:
Jordan Justen
2022-06-06 23:15:27 -07:00
committed by Marge Bot
parent 04fae05f7d
commit ffb0c97caf
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/common/meson.build
+20 -19
View File
@@ -75,25 +75,8 @@ idep_libintel_common = declare_dependency(
)
install_intel_gpu_tests = get_option('install-intel-gpu-tests')
if install_intel_gpu_tests
foreach g : [['70', 'gfx7'], ['75', 'hsw'], ['80', 'gfx8'],
['90', 'gfx9'], ['110', 'gfx11'], ['120', 'gfx12'],
['125', 'gfx125']]
executable(
'intel_@0@_mi_builder_test'.format(g[1]),
files('tests/mi_builder_test.cpp'),
cpp_args : [
cpp_msvc_compat_args,
'-DGFX_VERx10=@0@'.format(g[0])
],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_intel],
link_with : [libintel_dev],
dependencies : [dep_libdrm, idep_gtest, idep_genxml, idep_mesautil],
install : install_intel_gpu_tests,
)
endforeach
if install_intel_gpu_tests and not with_tests
error('`install-intel-gpu-tests` requires `build-tests`')
endif
if with_tests and not with_platform_android
@@ -126,4 +109,22 @@ if with_tests and not with_platform_android
args : ['-quiet'],
suite : ['intel'],
)
foreach g : [['70', 'gfx7'], ['75', 'hsw'], ['80', 'gfx8'],
['90', 'gfx9'], ['110', 'gfx11'], ['120', 'gfx12'],
['125', 'gfx125']]
executable(
'intel_@0@_mi_builder_test'.format(g[1]),
files('tests/mi_builder_test.cpp'),
cpp_args : [
cpp_msvc_compat_args,
'-DGFX_VERx10=@0@'.format(g[0])
],
gnu_symbol_visibility : 'hidden',
include_directories : [inc_include, inc_src, inc_intel],
link_with : [libintel_dev],
dependencies : [dep_libdrm, idep_gtest, idep_genxml, idep_mesautil],
install : install_intel_gpu_tests,
)
endforeach
endif