diff options
| -rw-r--r-- | amdgpu/meson.build | 4 | ||||
| -rw-r--r-- | etnaviv/meson.build | 5 | ||||
| -rw-r--r-- | exynos/meson.build | 4 | ||||
| -rw-r--r-- | freedreno/meson.build | 4 | ||||
| -rw-r--r-- | intel/meson.build | 22 | ||||
| -rw-r--r-- | libkms/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | nouveau/meson.build | 4 | ||||
| -rw-r--r-- | omap/meson.build | 4 | ||||
| -rw-r--r-- | radeon/meson.build | 4 | ||||
| -rw-r--r-- | tegra/meson.build | 4 |
11 files changed, 27 insertions, 35 deletions
diff --git a/amdgpu/meson.build b/amdgpu/meson.build index 7c8ccc7e..8168993a 100644 --- a/amdgpu/meson.build +++ b/amdgpu/meson.build @@ -59,7 +59,7 @@ ext_libdrm_amdgpu = declare_dependency( test( 'amdgpu-symbol-check', - prog_bash, + find_program('amdgpu-symbol-check'), env : env_test, - args : [files('amdgpu-symbol-check'), libdrm_amdgpu] + args : libdrm_amdgpu, ) diff --git a/etnaviv/meson.build b/etnaviv/meson.build index 515a4ed0..1ecf2940 100644 --- a/etnaviv/meson.build +++ b/etnaviv/meson.build @@ -54,6 +54,7 @@ ext_libdrm_etnaviv = declare_dependency( test( 'etnaviv-symbol-check', - prog_bash, - args : [files('etnaviv-symbol-check'), libdrm_etnaviv] + find_program('etnaviv-symbol-check'), + env : env_test, + args : libdrm_etnaviv, ) diff --git a/exynos/meson.build b/exynos/meson.build index bdfc3fc6..0136cb2a 100644 --- a/exynos/meson.build +++ b/exynos/meson.build @@ -48,7 +48,7 @@ pkg.generate( test( 'exynos-symbol-check', - prog_bash, + find_program('exynos-symbol-check'), env : env_test, - args : [files('exynos-symbol-check'), libdrm_exynos] + args : libdrm_exynos, ) diff --git a/freedreno/meson.build b/freedreno/meson.build index c9aba060..5d8d8e9b 100644 --- a/freedreno/meson.build +++ b/freedreno/meson.build @@ -71,7 +71,7 @@ pkg.generate( test( 'freedreno-symbol-check', - prog_bash, + find_program('freedreno-symbol-check'), env : env_test, - args : [files('freedreno-symbol-check'), libdrm_freedreno] + args : libdrm_freedreno, ) diff --git a/intel/meson.build b/intel/meson.build index 3d6bbac6..355bf35d 100644 --- a/intel/meson.build +++ b/intel/meson.build @@ -64,43 +64,37 @@ test_decode = executable( test( 'gen4-3d.batch', - prog_bash, - args : files('tests/gen4-3d.batch.sh'), + find_program('tests/gen4-3d.batch.sh'), workdir : meson.current_build_dir(), ) test( 'gen45-3d.batch', - prog_bash, - args : files('tests/gm45-3d.batch.sh'), + find_program('tests/gm45-3d.batch.sh'), workdir : meson.current_build_dir(), ) test( 'gen5-3d.batch', - prog_bash, - args : files('tests/gen5-3d.batch.sh'), + find_program('tests/gen5-3d.batch.sh'), workdir : meson.current_build_dir(), ) test( 'gen6-3d.batch', - prog_bash, - args : files('tests/gen6-3d.batch.sh'), + find_program('tests/gen6-3d.batch.sh'), workdir : meson.current_build_dir(), ) test( 'gen7-3d.batch', - prog_bash, - args : files('tests/gen7-3d.batch.sh'), + find_program('tests/gen7-3d.batch.sh'), workdir : meson.current_build_dir(), ) test( 'gen7-2d-copy.batch', - prog_bash, - args : files('tests/gen7-2d-copy.batch.sh'), + find_program('tests/gen7-2d-copy.batch.sh'), workdir : meson.current_build_dir(), ) test( 'intel-symbol-check', - prog_bash, + find_program('intel-symbol-check'), env : env_test, - args : [files('intel-symbol-check'), libdrm_intel] + args : libdrm_intel, ) diff --git a/libkms/meson.build b/libkms/meson.build index dc931608..04f018af 100644 --- a/libkms/meson.build +++ b/libkms/meson.build @@ -69,7 +69,7 @@ pkg.generate( test( 'kms-symbol-check', - prog_bash, + find_program('kms-symbol-check'), env : env_test, - args : [files('kms-symbol-check'), libkms] + args : libkms, ) diff --git a/meson.build b/meson.build index 072cb469..2323cc60 100644 --- a/meson.build +++ b/meson.build @@ -256,9 +256,6 @@ if prog_xslt.found() endif with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found() -# Used for tests -prog_bash = find_program('bash') - config.set10('HAVE_VISIBILITY', cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''', name : 'compiler supports __attribute__(("hidden"))')) diff --git a/nouveau/meson.build b/nouveau/meson.build index 0c1498d7..56e952ca 100644 --- a/nouveau/meson.build +++ b/nouveau/meson.build @@ -53,7 +53,7 @@ pkg.generate( test( 'nouveau-symbol-check', - prog_bash, + find_program('nouveau-symbol-check'), env : env_test, - args : [files('nouveau-symbol-check'), libdrm_nouveau] + args : libdrm_nouveau, ) diff --git a/omap/meson.build b/omap/meson.build index 54698c6a..f3ea36db 100644 --- a/omap/meson.build +++ b/omap/meson.build @@ -48,7 +48,7 @@ pkg.generate( test( 'omap-symbol-check', - prog_bash, + find_program('omap-symbol-check'), env : env_test, - args : [files('omap-symbol-check'), libdrm_omap] + args : libdrm_omap, ) diff --git a/radeon/meson.build b/radeon/meson.build index 1fc5282c..662b5bce 100644 --- a/radeon/meson.build +++ b/radeon/meson.build @@ -58,7 +58,7 @@ pkg.generate( test( 'radeon-symbol-check', - prog_bash, + find_program('radeon-symbol-check'), env : env_test, - args : [files('radeon-symbol-check'), libdrm_radeon] + args : libdrm_radeon, ) diff --git a/tegra/meson.build b/tegra/meson.build index 4bc454b6..ce56ddcf 100644 --- a/tegra/meson.build +++ b/tegra/meson.build @@ -47,7 +47,7 @@ pkg.generate( test( 'tegra-symbol-check', - prog_bash, + find_program('tegra-symbol-check'), env : env_test, - args : [files('tegra-symbol-check'), libdrm_tegra] + args : libdrm_tegra, ) |