Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / intel / tools / meson.build

diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index 063e7373ab39d8d14524a4b6a1c8a2fb7f106c2f..846a1df5357f08ef5c3f43601703d84b0519579a 100644 (file)
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -55,7 +55,7 @@ i965_disasm = executable(
   'i965_disasm',
   files('i965_disasm.c'),
   dependencies : [idep_mesautil, dep_thread],
-  include_directories : [inc_include, inc_src, inc_mesa, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_intel],
   link_with : [libintel_common, libintel_compiler, libintel_dev],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
@@ -116,7 +116,7 @@ libintel_dump_gpu = shared_library(
     'gen_context.h', 'gen8_context.h', 'gen10_context.h', 'intel_aub.h',
     'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c',
   ),
-  dependencies : dep_dl,
+  dependencies : [dep_dl, idep_mesautil],
   include_directories : [inc_include, inc_src, inc_intel],
   link_with : libintel_dev,
   c_args : [no_override_init_args],
@@ -162,48 +162,57 @@ if with_tools.contains('intel-ui')
 endif
 
 i965_gram_tab = custom_target(
-   'i965_gram.tab.[ch]',
-   input : 'i965_gram.y',
-   output : ['i965_gram.tab.c', 'i965_gram.tab.h'],
-   command : [
-      prog_bison, '@INPUT@', '--defines=@OUTPUT1@',
-      '--output=@OUTPUT0@'
-   ]
+  'i965_gram.tab.[ch]',
+  input : 'i965_gram.y',
+  output : ['i965_gram.tab.c', 'i965_gram.tab.h'],
+  command : [
+    prog_bison, '@INPUT@', '--defines=@OUTPUT1@',
+    '--output=@OUTPUT0@'
+  ]
 )
 
 i965_lex_yy_c = custom_target(
-   'i965_lex.yy.c',
-   input : 'i965_lex.l',
-   output : 'i965_lex.yy.c',
-   command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@']
+  'i965_lex.yy.c',
+  input : 'i965_lex.l',
+  output : 'i965_lex.yy.c',
+  command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@']
 )
 
 i965_asm = executable(
-   'i965_asm',
-   ['i965_asm.c', i965_gram_tab[0], i965_gram_tab[1], i965_lex_yy_c],
-   dependencies : [idep_mesautil, dep_thread],
-   include_directories : [inc_include, inc_src, inc_mesa, inc_intel],
-   link_with : [libintel_common, libintel_compiler, libintel_dev],
-   c_args : [no_override_init_args],
-   gnu_symbol_visibility : 'hidden',
-   install : true
+  'i965_asm',
+  ['i965_asm.c', i965_gram_tab[0], i965_gram_tab[1], i965_lex_yy_c],
+  dependencies : [idep_mesautil, dep_thread],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_intel],
+  link_with : [libintel_common, libintel_compiler, libintel_dev],
+  c_args : [no_override_init_args],
+  gnu_symbol_visibility : 'hidden',
+  install : true
 )
 
 asm_testcases = [
-   ['brw', 'tests/gen4'],
-   ['g4x', 'tests/gen4.5'],
-   ['ilk', 'tests/gen5'],
-   ['snb', 'tests/gen6'],
-   ['ivb', 'tests/gen7'],
-   ['hsw', 'tests/gen7.5'],
-   ['bdw', 'tests/gen8'],
-   ['skl', 'tests/gen9'],
-   ['icl', 'tests/gen11'],
+  ['brw', 'gen4'],
+  ['g4x', 'gen4.5'],
+  ['ilk', 'gen5'],
+  ['snb', 'gen6'],
+  ['ivb', 'gen7'],
+  ['hsw', 'gen7.5'],
+  ['bdw', 'gen8'],
+  ['skl', 'gen9'],
+  ['icl', 'gen11'],
 ]
 
-test_runner = find_program('tests/run-test.sh')
+test_runner = find_program('tests/run-test.py')
 foreach testcase : asm_testcases
-   test('i965_asm : ' + testcase[1], test_runner,
-        args : [i965_asm, testcase[1], testcase[0]],
-        env : ['srcdir=' + meson.current_source_dir()])
+  _gen_name = testcase[0]
+  _gen_num = testcase[1]
+  _gen_folder = join_paths(meson.current_source_dir(), 'tests', _gen_num)
+  test(
+    'i965_asm : ' + _gen_num, test_runner,
+    args : [
+      '--i965_asm', i965_asm,
+      '--gen_name', _gen_name,
+      '--gen_folder', _gen_folder,
+    ],
+    suite : 'intel',
+  )
 endforeach