*-symbols-check: let meson figure out how to execute the scripts

[android-x86/external-libdrm.git] / intel / meson.build

diff --git a/intel/meson.build b/intel/meson.build
index ad87727..355bf35 100644 (file)
--- a/intel/meson.build
+++ b/intel/meson.build
@@ -23,14 +23,14 @@ libdrm_intel = shared_library(
   [
     files(
       'intel_bufmgr.c', 'intel_bufmgr_fake.c', 'intel_bufmgr_gem.c',
-      'intel_decode.c', 'mm.c',
+      'intel_decode.c', 'mm.c', 'intel_chipset.c',
     ),
     config_file,
   ],
   include_directories : [inc_root, inc_drm],
   link_with : libdrm,
-  dependencies : [dep_pciaccess, dep_pthread_stubs, dep_rt, dep_valgrind],
-  c_args : warn_c_args,
+  dependencies : [dep_pciaccess, dep_pthread_stubs, dep_rt, dep_valgrind, dep_atomic_ops],
+  c_args : libdrm_c_args,
   version : '1.0.0',
   install : true,
 )
@@ -59,47 +59,42 @@ test_decode = executable(
   files('test_decode.c'),
   include_directories : [inc_root, inc_drm],
   link_with : [libdrm, libdrm_intel],
-  c_args : warn_c_args,
+  c_args : libdrm_c_args,
 )
 
 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,
-  args : [files('intel-symbol-check'), libdrm_intel]
+  find_program('intel-symbol-check'),
+  env : env_test,
+  args : libdrm_intel,
 )