From 0e9b79cefc1a65b59e128709cc4c51bfb42f524c 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: Mon, 5 Aug 2019 13:42:00 +0900 Subject: [PATCH] Remove softlink directory (#6188) Remove softlink directory scripts/standalone - made for CI infra workaround Update format check script Signed-off-by: Hyeongseok Oh --- Makefile.template | 4 ++-- infra/command/format | 2 +- infra/scripts/docker_build_test_x64.sh | 8 ++++---- scripts/standalone | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 120000 scripts/standalone diff --git a/Makefile.template b/Makefile.template index 832d6d0..44f00a5 100644 --- a/Makefile.template +++ b/Makefile.template @@ -155,7 +155,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 scripts infra/scripts $(INSTALL_ALIAS) --dereference + @tar -zcf test-suite.tar.gz tests/scripts tests/framework infra/scripts $(INSTALL_ALIAS) --dereference @mv test-suite.tar.gz $(INSTALL_ROOT)/. build_coverage_suite: install_internal @@ -163,7 +163,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 scripts infra/scripts $(INSTALL_ALIAS) --dereference -T include_lists.txt + @tar -zcf coverage-suite.tar.gz tests/scripts tests/framework infra/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/infra/command/format b/infra/command/format index eea0a38..774ef15 100644 --- a/infra/command/format +++ b/infra/command/format @@ -36,7 +36,7 @@ function check_permission() { FILES_TO_CHECK_PERMISSION=() for f in ${FILES_TO_CHECK[@]}; do # Manually ignore permission checking - if [[ ${f} == !(nnas|nnfw|nncc|*.sh|*.py|scripts/standalone) ]]; then + if [[ ${f} == !(nnas|nnfw|nncc|*.sh|*.py) ]]; then FILES_TO_CHECK_PERMISSION+=("${f}") fi done diff --git a/infra/scripts/docker_build_test_x64.sh b/infra/scripts/docker_build_test_x64.sh index 257a7a4..d7ff798 100755 --- a/infra/scripts/docker_build_test_x64.sh +++ b/infra/scripts/docker_build_test_x64.sh @@ -32,8 +32,8 @@ CMD="cp -nv Makefile.template Makefile && \ ./nnfw docker-run bash -c "$CMD" EXIT_CODE=$? -if [ ${EXITCODE} -ne 0 ]; then - exit ${EXITCODE} +if [ ${EXIT_CODE} -ne 0 ]; then + exit ${EXIT_CODE} fi # Model download server setting @@ -45,7 +45,7 @@ fi set -e export DOCKER_ENV_VARS=" -e MODELFILE_SERVER=$MODELFILE_SERVER" -./nnfw docker-run-user bash -c "./scripts/standalone/test_x64_neurun_cpu.sh" -./nnfw docker-run-user bash -c "./scripts/standalone/test_neurun_interp.sh" +./nnfw docker-run-user bash -c "./infra/scripts/test_x64_neurun_cpu.sh" +./nnfw docker-run-user bash -c "./infra/scripts/test_neurun_interp.sh" popd > /dev/null diff --git a/scripts/standalone b/scripts/standalone deleted file mode 120000 index bc7e1e0..0000000 --- a/scripts/standalone +++ /dev/null @@ -1 +0,0 @@ -../infra/scripts \ No newline at end of file -- 2.7.4