On 2019-06-16 15:23, Emil Velikov wrote:
As tweaked with previous patch - bash is not required. Any shell will do
Signed-off-by: Emil Velikov emil.l.velikov@gmail.com
Reviewed-by: Niclas Zeising zeising@daemonic.se
amdgpu/meson.build | 2 +- etnaviv/meson.build | 2 +- exynos/meson.build | 2 +- freedreno/meson.build | 2 +- intel/meson.build | 14 +++++++------- libkms/meson.build | 2 +- meson.build | 2 +- nouveau/meson.build | 2 +- omap/meson.build | 2 +- radeon/meson.build | 2 +- tegra/meson.build | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/amdgpu/meson.build b/amdgpu/meson.build index 7c8ccc7e..18e30166 100644 --- a/amdgpu/meson.build +++ b/amdgpu/meson.build @@ -59,7 +59,7 @@ ext_libdrm_amdgpu = declare_dependency(
test( 'amdgpu-symbol-check',
- prog_bash,
- prog_sh, env : env_test, args : [files('amdgpu-symbol-check'), libdrm_amdgpu] )
diff --git a/etnaviv/meson.build b/etnaviv/meson.build index 515a4ed0..82fbc208 100644 --- a/etnaviv/meson.build +++ b/etnaviv/meson.build @@ -54,6 +54,6 @@ ext_libdrm_etnaviv = declare_dependency(
test( 'etnaviv-symbol-check',
- prog_bash,
- prog_sh, args : [files('etnaviv-symbol-check'), libdrm_etnaviv] )
diff --git a/exynos/meson.build b/exynos/meson.build index bdfc3fc6..1de75220 100644 --- a/exynos/meson.build +++ b/exynos/meson.build @@ -48,7 +48,7 @@ pkg.generate(
test( 'exynos-symbol-check',
- prog_bash,
- prog_sh, env : env_test, args : [files('exynos-symbol-check'), libdrm_exynos] )
diff --git a/freedreno/meson.build b/freedreno/meson.build index c9aba060..277d5ec5 100644 --- a/freedreno/meson.build +++ b/freedreno/meson.build @@ -71,7 +71,7 @@ pkg.generate(
test( 'freedreno-symbol-check',
- prog_bash,
- prog_sh, env : env_test, args : [files('freedreno-symbol-check'), libdrm_freedreno] )
diff --git a/intel/meson.build b/intel/meson.build index 3d6bbac6..6f149c74 100644 --- a/intel/meson.build +++ b/intel/meson.build @@ -64,43 +64,43 @@ test_decode = executable(
test( 'gen4-3d.batch',
- prog_bash,
- prog_sh, args : files('tests/gen4-3d.batch.sh'), workdir : meson.current_build_dir(), ) test( 'gen45-3d.batch',
- prog_bash,
- prog_sh, args : files('tests/gm45-3d.batch.sh'), workdir : meson.current_build_dir(), ) test( 'gen5-3d.batch',
- prog_bash,
- prog_sh, args : files('tests/gen5-3d.batch.sh'), workdir : meson.current_build_dir(), ) test( 'gen6-3d.batch',
- prog_bash,
- prog_sh, args : files('tests/gen6-3d.batch.sh'), workdir : meson.current_build_dir(), ) test( 'gen7-3d.batch',
- prog_bash,
- prog_sh, args : files('tests/gen7-3d.batch.sh'), workdir : meson.current_build_dir(), ) test( 'gen7-2d-copy.batch',
- prog_bash,
- prog_sh, args : files('tests/gen7-2d-copy.batch.sh'), workdir : meson.current_build_dir(), ) test( 'intel-symbol-check',
- prog_bash,
- prog_sh, env : env_test, args : [files('intel-symbol-check'), libdrm_intel] )
diff --git a/libkms/meson.build b/libkms/meson.build index dc931608..7b8d34ad 100644 --- a/libkms/meson.build +++ b/libkms/meson.build @@ -69,7 +69,7 @@ pkg.generate(
test( 'kms-symbol-check',
- prog_bash,
- prog_sh, env : env_test, args : [files('kms-symbol-check'), libkms] )
diff --git a/meson.build b/meson.build index 64f0d5b1..ed407009 100644 --- a/meson.build +++ b/meson.build @@ -249,7 +249,7 @@ endif with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found()
# Used for tests -prog_bash = find_program('bash') +prog_sh = find_program('sh')
config.set10('HAVE_VISIBILITY', cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''', diff --git a/nouveau/meson.build b/nouveau/meson.build index 0c1498d7..eda0fd3d 100644 --- a/nouveau/meson.build +++ b/nouveau/meson.build @@ -53,7 +53,7 @@ pkg.generate(
test( 'nouveau-symbol-check',
- prog_bash,
- prog_sh, env : env_test, args : [files('nouveau-symbol-check'), libdrm_nouveau] )
diff --git a/omap/meson.build b/omap/meson.build index 54698c6a..7c11b5e8 100644 --- a/omap/meson.build +++ b/omap/meson.build @@ -48,7 +48,7 @@ pkg.generate(
test( 'omap-symbol-check',
- prog_bash,
- prog_sh, env : env_test, args : [files('omap-symbol-check'), libdrm_omap] )
diff --git a/radeon/meson.build b/radeon/meson.build index 1fc5282c..d272800f 100644 --- a/radeon/meson.build +++ b/radeon/meson.build @@ -58,7 +58,7 @@ pkg.generate(
test( 'radeon-symbol-check',
- prog_bash,
- prog_sh, env : env_test, args : [files('radeon-symbol-check'), libdrm_radeon] )
diff --git a/tegra/meson.build b/tegra/meson.build index 4bc454b6..f385f72e 100644 --- a/tegra/meson.build +++ b/tegra/meson.build @@ -47,7 +47,7 @@ pkg.generate(
test( 'tegra-symbol-check',
- prog_bash,
- prog_sh, env : env_test, args : [files('tegra-symbol-check'), libdrm_tegra] )