[Test/Coverage] update source path

1. exclude tests directory in test coverage
2. set full path to get coverage report
3. print valid path while processing coverage report
4. remove unnecessary flag and clean meson script

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/meson.build b/meson.build
index 5b11601..2f05b41 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -117,7 +117,6 @@ endif
 
 # Tensorflow-lite
 have_tensorflow_lite = false
-install_test=false
 
 if get_option('enable-tensorflow-lite')
   tflite_dep = dependency('tensorflow-lite', required: true)
@@ -148,9 +147,6 @@ endif
 
 # Build unittests
 if get_option('enable-test')
-  if get_option('install-test')
-    install_test=true
-  endif
   subdir('tests')
 endif
 

diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec
index 6140767..661646e 100644 (file)
--- a/packaging/nnstreamer.spec
+++ b/packaging/nnstreamer.spec
@@ -233,7 +233,7 @@ DESTDIR=%{buildroot} ninja -C build %{?_smp_mflags} install
     # Generate report
     lcov -t 'NNStreamer Unit Test Coverage' -o unittest.info -c -d . -b $(pwd) --no-external
     # Exclude generated files (Orc)
-    lcov -r unittest.info "*/*-orc.*" -o unittest-filtered.info
+    lcov -r unittest.info "*/*-orc.*" "*/tests/*" -o unittest-filtered.info
     # Visualize the report
     genhtml -o result unittest-filtered.info -t "nnstreamer %{version}-%{release} ${VCS}" --ignore-errors source -p ${RPM_BUILD_DIR}
 %endif

diff --git a/tests/meson.build b/tests/meson.build
index 2b15abf..9aeb838 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -2,14 +2,14 @@
 library('nnscustom_framecounter',
   join_paths('nnstreamer_sink', 'nnscustom_framecounter.c'),
   dependencies: [glib_dep, nnstreamer_dep],
-  install: install_test,
+  install: get_option('install-test'),
   install_dir: customfilter_install_dir
 )
 
 library('nnscustom_drop_buffer',
   join_paths('nnstreamer_sink', 'nnscustom_drop_buffer.c'),
   dependencies: [nnstreamer_dep],
-  install: install_test,
+  install: get_option('install-test'),
   install_dir: customfilter_install_dir
 )
 
@@ -19,7 +19,7 @@ if libpng_dep.found()
   b2p = executable('bmp2png',
     'bmp2png.c',
     dependencies: [libpng_dep],
-    install: install_test,
+    install: get_option('install-test'),
     install_dir: unittest_install_dir
   )
 
@@ -36,7 +36,7 @@ endif
 executable('unittest_repo',
   join_paths('nnstreamer_repo_dynamicity', 'tensor_repo_dynamic_test.c'),
   dependencies: [nnstreamer_dep, gst_dep, glib_dep],
-  install: install_test,
+  install: get_option('install-test'),
   install_dir: unittest_install_dir
 )
 
@@ -55,7 +55,7 @@ if gtest_dep.found()
   unittest_common = executable('unittest_common',
     join_paths('common', 'unittest_common.cpp'),
     dependencies: [nnstreamer_unittest_deps],
-    install: install_test,
+    install: get_option('install-test'),
     install_dir: unittest_install_dir
   )
 
@@ -65,7 +65,7 @@ if gtest_dep.found()
   unittest_sink = executable('unittest_sink',
     join_paths('nnstreamer_sink', 'unittest_sink.cpp'),
     dependencies: [nnstreamer_unittest_deps],
-    install: install_test,
+    install: get_option('install-test'),
     install_dir: unittest_install_dir
   )
 
@@ -75,7 +75,7 @@ if gtest_dep.found()
   unittest_plugins = executable('unittest_plugins',
     join_paths('nnstreamer_plugins', 'unittest_plugins.cpp'),
     dependencies: [nnstreamer_unittest_deps],
-    install: install_test,
+    install: get_option('install-test'),
     install_dir: unittest_install_dir
   )
 
@@ -85,7 +85,7 @@ if gtest_dep.found()
   unittest_src_iio = executable('unittest_src_iio',
     join_paths('nnstreamer_source', 'unittest_src_iio.cpp'),
     dependencies: [nnstreamer_unittest_deps],
-    install: install_test,
+    install: get_option('install-test'),
     install_dir: unittest_install_dir
   )
 
@@ -99,20 +99,20 @@ endif
 
 # Install Unittest
 if get_option('install-test')
-   install_subdir('nnstreamer_converter', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('nnstreamer_merge', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('nnstreamer_decoder', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('nnstreamer_demux', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('nnstreamer_filter_custom', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('nnstreamer_mux', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('nnstreamer_repo', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('nnstreamer_repo_dynamicity', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('nnstreamer_repo_lstm', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('nnstreamer_repo_rnn', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('nnstreamer_split', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('transform_arithmetic', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('transform_dimchg', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('transform_stand', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('transform_transpose', install_dir: join_paths(unittest_install_dir,'tests'))
-   install_subdir('transform_typecast', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_converter', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_merge', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_decoder', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_demux', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_filter_custom', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_mux', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_repo', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_repo_dynamicity', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_repo_lstm', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_repo_rnn', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('nnstreamer_split', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('transform_arithmetic', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('transform_dimchg', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('transform_stand', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('transform_transpose', install_dir: join_paths(unittest_install_dir,'tests'))
+  install_subdir('transform_typecast', install_dir: join_paths(unittest_install_dir,'tests'))
 endif

diff --git a/tests/unittestcoverage.py b/tests/unittestcoverage.py
index c65e9d6..2cae188 100755 (executable)
--- a/tests/unittestcoverage.py
+++ b/tests/unittestcoverage.py
@@ -233,7 +233,8 @@ def cmd_module(paths):
     return -1
 
   print("\n\n===========================================================")
-  print(str(path) + ": " + str(lines) + " Lines with " + str(rate) + "% unit test coverage")
+  print("Paths for test coverage " + str(paths))
+  print(str(lines) + " Lines with " + str(rate) + "% unit test coverage")
   print("===========================================================\n\n\n")
   return 0
 

diff --git a/tizen-api/meson.build b/tizen-api/meson.build
index 5d896c1..b78f2b1 100644 (file)
--- a/tizen-api/meson.build
+++ b/tizen-api/meson.build
@@ -20,13 +20,11 @@ if meson.project_name() != 'nnstreamer'
 endif
 
 
-capi_main = [
-  'src/tizen-api-pipeline.c'
-]
+capi_main = []
+capi_main += join_paths(meson.current_source_dir(), 'src', 'tizen-api-pipeline.c')
 
-capi_devel_main = [
-  'include/tizen-api.h'
-]
+capi_devel_main = []
+capi_devel_main += join_paths(meson.current_source_dir(), 'include', 'tizen-api.h')
 
 inc = include_directories('include')
 nninc = include_directories('../gst')