[test] fix meson test option

This patch fixes meson test option for 2.4

Signed-off-by: Yelin Jeong <yelini.jeong@samsung.com>

diff --git a/.github/actions/test-ubuntu/action.yml b/.github/actions/test-ubuntu/action.yml
index fb248d1aa8f1b9528fa281a69fdc7fb71dbe1586..bdd8fe7f90cf43a79a6267c394f171ece0e22051 100644 (file)
--- a/.github/actions/test-ubuntu/action.yml
+++ b/.github/actions/test-ubuntu/action.yml
@@ -21,6 +21,6 @@ runs:
     # Check reference models
     - run: |
         pushd build
-        meson test ${{ inputs.mode }}
+        meson test ${{ inputs.mode }} --print-errorlogs
         popd
       shell: bash

diff --git a/tests/apptests/meson.build b/tests/apptests/meson.build
index 90b4fa290cfe6240023a45070c52a846bfe4e852..0c4801f47d821b2d762c146c5ad3bafecf572860 100644 (file)
--- a/tests/apptests/meson.build
+++ b/tests/apptests/meson.build
@@ -58,7 +58,7 @@ apptest_tvn_triv2_bulk = executable ('apptest_tvn_triv2_bulk',
   install_rpath : ne_libdir,
   install_dir : join_paths(ne_bindir, 'apptests')
 )
-test('apptest_tvn_triv2_bulk', apptest_tvn_triv2_bulk, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS') ], timeout: 2000)
+test('apptest_tvn_triv2_bulk', apptest_tvn_triv2_bulk, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV240') ], timeout: 2000)
 
 apptest_tvn_triv2 = executable ('apptest_tvn_triv2',
   'tvn_triv2.cc',
@@ -69,7 +69,7 @@ apptest_tvn_triv2 = executable ('apptest_tvn_triv2',
   install_rpath : ne_libdir,
   install_dir : join_paths(ne_bindir, 'apptests')
 )
-test('apptest_tvn_triv2', apptest_tvn_triv2, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/MOBILENET_V1') ], timeout: 100, suite: ['fast-test'])
+test('apptest_tvn_triv2', apptest_tvn_triv2, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV240/MOBILENET_V1') ], timeout: 100, suite: ['fast-test'])
 
 apptest_tvn_triv2_dmabuf = executable ('apptest_tvn_triv2_dmabuf',
   'tvn_triv2_dmabuf.cc',
@@ -80,7 +80,7 @@ apptest_tvn_triv2_dmabuf = executable ('apptest_tvn_triv2_dmabuf',
   install_rpath : ne_libdir,
   install_dir : join_paths(ne_bindir, 'apptests')
 )
-test('apptest_tvn_triv2_dmabuf', apptest_tvn_triv2_dmabuf, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/MOBILENET_V1') ], timeout : 100, suite: ['fast-test'])
+test('apptest_tvn_triv2_dmabuf', apptest_tvn_triv2_dmabuf, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV240/MOBILENET_V1') ], timeout : 100, suite: ['fast-test'])
 
 foreach model : models
   test('apptest_tvn_triv2_dmabuf_all', apptest_tvn_triv2_dmabuf, env: testenv, args: [ model ], timeout : 6000)
@@ -120,7 +120,7 @@ apptest_tvn_triv2_profile = executable ('apptest_tvn_triv2_profile',
   install_rpath : ne_libdir,
   install_dir : join_paths(ne_bindir, 'apptests')
 )
-test('apptest_tvn_triv2_profile', apptest_tvn_triv2_profile, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/MOBILENET_V1'), '-p', 'visa'], timeout: 100, suite: ['fast-test'])
+test('apptest_tvn_triv2_profile', apptest_tvn_triv2_profile, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV240/MOBILENET_V1'), '-p', 'visa'], timeout: 100, suite: ['fast-test'])
 
 executable ('apptest_tvn_triv2_profile_example',
   'tvn_triv2_profile_example.cc',
@@ -151,10 +151,10 @@ apptest_tvn_triv2_aging = executable ('apptest_tvn_triv2_aging',
   install_rpath : ne_libdir,
   install_dir : join_paths(ne_bindir, 'apptests')
 )
-test('apptest_tvn_triv2_aging_0', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/CONV_2D_300'), '1', '10'], suite: ['fast-test'])
-test('apptest_tvn_triv2_aging_1', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/CONV_2D_300'), '2', '10'], suite: ['fast-test'])
-test('apptest_tvn_triv2_aging_2', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/CONV_2D_300'), '3', '10'], suite: ['fast-test'])
-test('apptest_tvn_triv2_aging_3', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/CONV_2D_300'), '4', '10'], suite: ['fast-test'])
+test('apptest_tvn_triv2_aging_0', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV240/CONV_2D_300'), '1', '10'], suite: ['fast-test'])
+test('apptest_tvn_triv2_aging_1', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV240/CONV_2D_300'), '2', '10'], suite: ['fast-test'])
+test('apptest_tvn_triv2_aging_2', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV240/CONV_2D_300'), '3', '10'], suite: ['fast-test'])
+test('apptest_tvn_triv2_aging_3', apptest_tvn_triv2_aging, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV240/CONV_2D_300'), '4', '10'], suite: ['fast-test'])
 
 foreach model : models
   test('apptest_tvn_triv2_aging_all', apptest_tvn_triv2_aging, env: testenv, args: [ model, '4', '10' ], timeout : 6000)
@@ -169,7 +169,7 @@ apptest_tvn_triv2_interleave = executable ('apptest_tvn_triv2_interleave',
   install_rpath : ne_libdir,
   install_dir : join_paths(ne_bindir, 'apptests')
 )
-test('apptest_tvn_triv2_interleave', apptest_tvn_triv2_interleave, env: testenv, args: [ '10', join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/MAX_POOL_2D_000'), join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/CONV_2D_300') ], suite: ['fast-test'])
+test('apptest_tvn_triv2_interleave', apptest_tvn_triv2_interleave, env: testenv, args: [ '10', join_paths(ne_datadir, 'testdata/TRIV240/MAX_POOL_2D_000'), join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/CONV_2D_300') ], suite: ['fast-test'])
 
 apptest_tvn_triv2_sigkill = executable ('apptest_tvn_triv2_sigkill',
   'tvn_triv2_sigkill.cc',
@@ -180,7 +180,7 @@ apptest_tvn_triv2_sigkill = executable ('apptest_tvn_triv2_sigkill',
   install_rpath : ne_libdir,
   install_dir : join_paths(ne_bindir, 'apptests')
 )
-test('apptest_tvn_triv2_sigkill', apptest_tvn_triv2_sigkill, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV238_2TOPS/MOBILENET_V1') ], timeout : 200, suite: ['fast-test'])
+test('apptest_tvn_triv2_sigkill', apptest_tvn_triv2_sigkill, env: testenv, args: [ join_paths(ne_datadir, 'testdata/TRIV240/MOBILENET_V1') ], timeout : 200, suite: ['fast-test'])
 
 foreach model : models
   test('apptest_tvn_triv2_sigkill_all', apptest_tvn_triv2_sigkill, env: testenv, args: [ model ], timeout : 6000)