diff --git a/meson.build b/meson.build index c71643458cd..fdb5e688462 100644 --- a/meson.build +++ b/meson.build @@ -80,6 +80,7 @@ with_moltenvk_dir = get_option('moltenvk-dir') with_vulkan_icd_dir = get_option('vulkan-icd-dir') with_tests = get_option('build-tests') with_glcpp_tests = get_option('enable-glcpp-tests') +with_radv_tests = get_option('build-radv-tests') with_aco_tests = get_option('build-aco-tests') with_glx_read_only_text = get_option('glx-read-only-text') with_glx_direct = get_option('glx-direct') @@ -351,6 +352,9 @@ endif if with_aco_tests and not with_amd_vk error('ACO tests require Radv') endif +if with_radv_tests and not with_amd_vk + error('RADV tests require RADV') +endif with_microsoft_clc = get_option('microsoft-clc').enabled() with_spirv_to_dxil = get_option('spirv-to-dxil') diff --git a/meson.options b/meson.options index 2622cf1d235..fa23dbee4d6 100644 --- a/meson.options +++ b/meson.options @@ -464,6 +464,13 @@ option( description : 'Build glcpp unit tests. These are flaky on CI.' ) +option( + 'build-radv-tests', + type : 'boolean', + value : false, + description : 'Build RADV tests. These do not require an AMD GPU.' +) + option( 'build-aco-tests', type : 'boolean', diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 323de5a6900..2ba0f741f92 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -313,7 +313,7 @@ devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) # Deprecated: replaced by VK_DRIVER_FILES above devenv.append('VK_ICD_FILENAMES', _dev_icd.full_path()) -if with_tests +if with_radv_tests test( 'radv_tests', executable(