install all skiplist file (#3209)

* install all skiplist file

install all skiplist file when enable building both runtime
User can change skiplist file by copy or rename

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
* Fix unittest script

Fix unittest script ignore *.skip* files

diff --git a/runtimes/tests/neural_networks_test/CMakeLists.txt b/runtimes/tests/neural_networks_test/CMakeLists.txt
index 91c4ee5..75efb51 100644 (file)
--- a/runtimes/tests/neural_networks_test/CMakeLists.txt
+++ b/runtimes/tests/neural_networks_test/CMakeLists.txt
@@ -36,3 +36,12 @@ install(FILES ${SKIPLIST_FILE_NAME}
         DESTINATION unittest
         RENAME ${RUNTIME_ANDROID_NN_TEST}.skip
         OPTIONAL)
+
+# If build both runtime (pure_arm_compute and neurun) at once,
+# install both skiplist file as backup
+if (BUILD_NEURUN AND BUILD_PURE_ARM_COMPUTE)
+  set(SKIPLIST_ALL_RUNTIME
+    ${RUNTIME_ANDROID_NN_TEST}.skip.${TARGET_PLATFORM}
+    ${RUNTIME_ANDROID_NN_TEST}.skip.${TARGET_PLATFORM}.neurun)
+  install(FILES ${SKIPLIST_ALL_RUNTIME} DESTINATION unittest OPTIONAL)
+endif()

diff --git a/tools/test_driver/run_unittest.sh b/tools/test_driver/run_unittest.sh
index abf3194..5eddfb3 100755 (executable)
--- a/tools/test_driver/run_unittest.sh
+++ b/tools/test_driver/run_unittest.sh
@@ -66,7 +66,7 @@ echo "Unittest start"
 echo "============================================"
 
 num_unittest=0
-for TEST_BIN in `ls $UNITTEST_TEST_DIR --hide=*.skip`; do
+for TEST_BIN in `ls $UNITTEST_TEST_DIR --hide=*.skip*`; do
     num_unittest=$((num_unittest+1))
     echo "============================================"
     echo "Starting set $num_unittest: $TEST_BIN..."