[Chores] s/nnstreamer-filter/nnstreamer

To match the directory name, moved test/nnstreamer-filter to nnstreamer

+ minor reformatting on a meson.build

**Self evaluation:**
1. Build test: [X]Passed [ ]Failed [ ]Skipped
2. Run test: [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: Jihoon Lee <jhoon.it.lee@samsung.com>

diff --git a/Applications/Custom/LayerPlugin/meson.build b/Applications/Custom/LayerPlugin/meson.build
index 42cf372..3cc4f1b 100644 (file)
--- a/Applications/Custom/LayerPlugin/meson.build
+++ b/Applications/Custom/LayerPlugin/meson.build
@@ -21,10 +21,9 @@ if get_option('enable-test')
     nntrainer_testutil_dep
   ],
   install: get_option('enable-test'),
-  install_dir: application_install_dir
-)
+  install_dir: application_install_dir)
 
-testenv = environment()
-testenv.set('NNTRAINER_PATH', meson.current_build_dir())
-test('app_plugin_test', exe, env: testenv)
+  testenv = environment()
+  testenv.set('NNTRAINER_PATH', meson.current_build_dir())
+  test('app_plugin_test', exe, env: testenv)
 endif

diff --git a/packaging/nntrainer.spec b/packaging/nntrainer.spec
index 94c594b..9fbbcb7 100644 (file)
--- a/packaging/nntrainer.spec
+++ b/packaging/nntrainer.spec
@@ -330,7 +330,7 @@ tar xzf unittest_layers.tar.gz -C build
 # independent unittests of nntrainer
 bash %{test_script} ./test
 
-# export NNSTREAMER_CONF=$(pwd)/test/nnstreamer_filter_nntrainer/nnstreamer-test.ini
+# export NNSTREAMER_CONF=$(pwd)/test/nnstreamer/nnstreamer-test.ini
 # export NNSTREAMER_FILTERS=$(pwd)/build/nnstreamer/tensor_filter
 pushd build
 
@@ -348,9 +348,9 @@ popd
 
 # unittest for nntrainer plugin for nnstreamer
 # %if 0%{?nnstreamer_filter}
-# export NNSTREAMER_CONF=$(pwd)/test/nnstreamer_filter_nntrainer/nnstreamer-test.ini
+# export NNSTREAMER_CONF=$(pwd)/test/nnstreamer/nnstreamer-test.ini
 # export NNSTREAMER_FILTERS=$(pwd)/build/nnstreamer/tensor_filter
-# pushd test/nnstreamer_filter_nntrainer
+# pushd test/nnstreamer
 # bash runTest.sh
 # popd
 # %endif #nnstreamer_filter

diff --git a/test/nnstreamer_filter_nntrainer/checkLabel.py b/test/nnstreamer/checkLabel.py
similarity index 100%
rename from test/nnstreamer_filter_nntrainer/checkLabel.py
rename to test/nnstreamer/checkLabel.py

diff --git a/test/nnstreamer_filter_nntrainer/gen24bBMP.py b/test/nnstreamer/gen24bBMP.py
similarity index 100%
rename from test/nnstreamer_filter_nntrainer/gen24bBMP.py
rename to test/nnstreamer/gen24bBMP.py

diff --git a/test/nnstreamer_filter_nntrainer/nnstreamer-test.ini b/test/nnstreamer/nnstreamer-test.ini
similarity index 100%
rename from test/nnstreamer_filter_nntrainer/nnstreamer-test.ini
rename to test/nnstreamer/nnstreamer-test.ini

diff --git a/test/nnstreamer_filter_nntrainer/runTest.sh b/test/nnstreamer/runTest.sh
similarity index 100%
rename from test/nnstreamer_filter_nntrainer/runTest.sh
rename to test/nnstreamer/runTest.sh