| Révision | dddeff5028e1f3f34f67846c12876cd189c61bd1 (tree) |
|---|---|
| l'heure | 2019-10-04 17:43:00 |
| Auteur | Eric Engestrom <eric.engestrom@inte...> |
| Commiter | Eric Engestrom |
*-symbols-check: let meson figure out how to execute the scripts
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
amdgpu/meson.build (diff) etnaviv/meson.build (diff) exynos/meson.build (diff) freedreno/meson.build (diff) intel/meson.build (diff) libkms/meson.build (diff) meson.build (diff) nouveau/meson.build (diff) omap/meson.build (diff) radeon/meson.build (diff) tegra/meson.build (diff)| @@ -59,7 +59,7 @@ ext_libdrm_amdgpu = declare_dependency( | ||
| 59 | 59 | |
| 60 | 60 | test( |
| 61 | 61 | 'amdgpu-symbol-check', |
| 62 | - prog_bash, | |
| 62 | + find_program('amdgpu-symbol-check'), | |
| 63 | 63 | env : env_test, |
| 64 | - args : [files('amdgpu-symbol-check'), libdrm_amdgpu] | |
| 64 | + args : libdrm_amdgpu, | |
| 65 | 65 | ) |
| @@ -48,7 +48,7 @@ pkg.generate( | ||
| 48 | 48 | |
| 49 | 49 | test( |
| 50 | 50 | 'exynos-symbol-check', |
| 51 | - prog_bash, | |
| 51 | + find_program('exynos-symbol-check'), | |
| 52 | 52 | env : env_test, |
| 53 | - args : [files('exynos-symbol-check'), libdrm_exynos] | |
| 53 | + args : libdrm_exynos, | |
| 54 | 54 | ) |
| @@ -71,7 +71,7 @@ pkg.generate( | ||
| 71 | 71 | |
| 72 | 72 | test( |
| 73 | 73 | 'freedreno-symbol-check', |
| 74 | - prog_bash, | |
| 74 | + find_program('freedreno-symbol-check'), | |
| 75 | 75 | env : env_test, |
| 76 | - args : [files('freedreno-symbol-check'), libdrm_freedreno] | |
| 76 | + args : libdrm_freedreno, | |
| 77 | 77 | ) |
| @@ -64,43 +64,37 @@ test_decode = executable( | ||
| 64 | 64 | |
| 65 | 65 | test( |
| 66 | 66 | 'gen4-3d.batch', |
| 67 | - prog_bash, | |
| 68 | - args : files('tests/gen4-3d.batch.sh'), | |
| 67 | + find_program('tests/gen4-3d.batch.sh'), | |
| 69 | 68 | workdir : meson.current_build_dir(), |
| 70 | 69 | ) |
| 71 | 70 | test( |
| 72 | 71 | 'gen45-3d.batch', |
| 73 | - prog_bash, | |
| 74 | - args : files('tests/gm45-3d.batch.sh'), | |
| 72 | + find_program('tests/gm45-3d.batch.sh'), | |
| 75 | 73 | workdir : meson.current_build_dir(), |
| 76 | 74 | ) |
| 77 | 75 | test( |
| 78 | 76 | 'gen5-3d.batch', |
| 79 | - prog_bash, | |
| 80 | - args : files('tests/gen5-3d.batch.sh'), | |
| 77 | + find_program('tests/gen5-3d.batch.sh'), | |
| 81 | 78 | workdir : meson.current_build_dir(), |
| 82 | 79 | ) |
| 83 | 80 | test( |
| 84 | 81 | 'gen6-3d.batch', |
| 85 | - prog_bash, | |
| 86 | - args : files('tests/gen6-3d.batch.sh'), | |
| 82 | + find_program('tests/gen6-3d.batch.sh'), | |
| 87 | 83 | workdir : meson.current_build_dir(), |
| 88 | 84 | ) |
| 89 | 85 | test( |
| 90 | 86 | 'gen7-3d.batch', |
| 91 | - prog_bash, | |
| 92 | - args : files('tests/gen7-3d.batch.sh'), | |
| 87 | + find_program('tests/gen7-3d.batch.sh'), | |
| 93 | 88 | workdir : meson.current_build_dir(), |
| 94 | 89 | ) |
| 95 | 90 | test( |
| 96 | 91 | 'gen7-2d-copy.batch', |
| 97 | - prog_bash, | |
| 98 | - args : files('tests/gen7-2d-copy.batch.sh'), | |
| 92 | + find_program('tests/gen7-2d-copy.batch.sh'), | |
| 99 | 93 | workdir : meson.current_build_dir(), |
| 100 | 94 | ) |
| 101 | 95 | test( |
| 102 | 96 | 'intel-symbol-check', |
| 103 | - prog_bash, | |
| 97 | + find_program('intel-symbol-check'), | |
| 104 | 98 | env : env_test, |
| 105 | - args : [files('intel-symbol-check'), libdrm_intel] | |
| 99 | + args : libdrm_intel, | |
| 106 | 100 | ) |
| @@ -69,7 +69,7 @@ pkg.generate( | ||
| 69 | 69 | |
| 70 | 70 | test( |
| 71 | 71 | 'kms-symbol-check', |
| 72 | - prog_bash, | |
| 72 | + find_program('kms-symbol-check'), | |
| 73 | 73 | env : env_test, |
| 74 | - args : [files('kms-symbol-check'), libkms] | |
| 74 | + args : libkms, | |
| 75 | 75 | ) |
| @@ -256,9 +256,6 @@ if prog_xslt.found() | ||
| 256 | 256 | endif |
| 257 | 257 | with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found() |
| 258 | 258 | |
| 259 | -# Used for tests | |
| 260 | -prog_bash = find_program('bash') | |
| 261 | - | |
| 262 | 259 | config.set10('HAVE_VISIBILITY', |
| 263 | 260 | cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''', |
| 264 | 261 | name : 'compiler supports __attribute__(("hidden"))')) |
| @@ -53,7 +53,7 @@ pkg.generate( | ||
| 53 | 53 | |
| 54 | 54 | test( |
| 55 | 55 | 'nouveau-symbol-check', |
| 56 | - prog_bash, | |
| 56 | + find_program('nouveau-symbol-check'), | |
| 57 | 57 | env : env_test, |
| 58 | - args : [files('nouveau-symbol-check'), libdrm_nouveau] | |
| 58 | + args : libdrm_nouveau, | |
| 59 | 59 | ) |
| @@ -48,7 +48,7 @@ pkg.generate( | ||
| 48 | 48 | |
| 49 | 49 | test( |
| 50 | 50 | 'omap-symbol-check', |
| 51 | - prog_bash, | |
| 51 | + find_program('omap-symbol-check'), | |
| 52 | 52 | env : env_test, |
| 53 | - args : [files('omap-symbol-check'), libdrm_omap] | |
| 53 | + args : libdrm_omap, | |
| 54 | 54 | ) |
| @@ -58,7 +58,7 @@ pkg.generate( | ||
| 58 | 58 | |
| 59 | 59 | test( |
| 60 | 60 | 'radeon-symbol-check', |
| 61 | - prog_bash, | |
| 61 | + find_program('radeon-symbol-check'), | |
| 62 | 62 | env : env_test, |
| 63 | - args : [files('radeon-symbol-check'), libdrm_radeon] | |
| 63 | + args : libdrm_radeon, | |
| 64 | 64 | ) |
| @@ -47,7 +47,7 @@ pkg.generate( | ||
| 47 | 47 | |
| 48 | 48 | test( |
| 49 | 49 | 'tegra-symbol-check', |
| 50 | - prog_bash, | |
| 50 | + find_program('tegra-symbol-check'), | |
| 51 | 51 | env : env_test, |
| 52 | - args : [files('tegra-symbol-check'), libdrm_tegra] | |
| 52 | + args : libdrm_tegra, | |
| 53 | 53 | ) |
Android-x86
Fork