From 89dcff6396df0963ad09923c292f69c346da724b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Thu, 7 Mar 2019 09:55:31 +0900 Subject: [PATCH] Fix packaging related code (#4593) Packaging scripts in test suite to support test in target device Call build_test_suite for x64 test Signed-off-by: Hyeongseok Oh --- Makefile | 4 ++-- scripts/standalone/docker_build_test_x64.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 72789a1..33d07d0 100644 --- a/Makefile +++ b/Makefile @@ -141,7 +141,7 @@ install_internal: build_test_suite: install_internal @echo "packaging test suite" @rm -rf $(INSTALL_ROOT)/test-suite.tar.gz - @tar -zcf test-suite.tar.gz tests/scripts tests/framework $(INSTALL_ALIAS) --dereference + @tar -zcf test-suite.tar.gz tests/scripts tests/framework scripts $(INSTALL_ALIAS) --dereference @mv test-suite.tar.gz $(INSTALL_ROOT)/. build_coverage_suite: install_internal @@ -149,7 +149,7 @@ build_coverage_suite: install_internal @rm -rf $(INSTALL_ROOT)/coverage-suite.tar.gz @find Product -name "*.gcno" > include_lists.txt @pwd | grep -o '/' | wc -l > tests/scripts/build_path_depth.txt - @tar -zcf coverage-suite.tar.gz tests/scripts tests/framework $(INSTALL_ALIAS) --dereference -T include_lists.txt + @tar -zcf coverage-suite.tar.gz tests/scripts tests/framework scripts $(INSTALL_ALIAS) --dereference -T include_lists.txt @rm -rf include_lists.txt tests/scripts/build_path_depth.txt @mv coverage-suite.tar.gz $(INSTALL_ROOT)/. diff --git a/scripts/standalone/docker_build_test_x64.sh b/scripts/standalone/docker_build_test_x64.sh index b354aab..0848452 100755 --- a/scripts/standalone/docker_build_test_x64.sh +++ b/scripts/standalone/docker_build_test_x64.sh @@ -22,7 +22,8 @@ pushd $ROOT_PATH > /dev/null CMD="export OPTIONS+='-DBUILD_NEURUN=ON -DBUILD_PURE_ARM_COMPUTE=OFF' && \ make && \ - make install" + make install && \ + make build_test_suite" source nnfw docker-run-user bash -c "$CMD" -- 2.7.4