From f05428be675e1a7b4abf8f07073974a21e90501d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Fri, 19 Oct 2018 10:21:10 +0900 Subject: [PATCH] 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 * Fix unittest script Fix unittest script ignore *.skip* files --- runtimes/tests/neural_networks_test/CMakeLists.txt | 9 +++++++++ tools/test_driver/run_unittest.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/runtimes/tests/neural_networks_test/CMakeLists.txt b/runtimes/tests/neural_networks_test/CMakeLists.txt index 91c4ee5..75efb51 100644 --- 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 --- 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..." -- 2.7.4