diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2022-06-06 23:15:27 -0700 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2022-06-07 10:19:22 -0700 |
| commit | 8ef594702c6308a67e1a385ea81a2fd77ce83832 (patch) | |
| tree | 734d645527817607acc5458ff8facf8ccf0f399c | |
| parent | f618d0292a88944b0262809d6ed24fb9a1ff5410 (diff) | |
intel: Build mi_builder_test whenever build-tests is setbuild-tests-mi_builder_test
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>
| -rw-r--r-- | src/intel/common/meson.build | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build index 894486985c9..4cd076c73fd 100644 --- a/src/intel/common/meson.build +++ b/src/intel/common/meson.build @@ -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 |