[CI/script] Revise test scripts (#9327)
author오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Tue, 3 Dec 2019 00:56:56 +0000 (09:56 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Tue, 3 Dec 2019 00:56:56 +0000 (09:56 +0900)
Source common script and use variable

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
infra/scripts/test_arm_nnpkg.sh
infra/scripts/test_coverage.sh
infra/scripts/test_make_nnpkg.sh

index 0be4140..04e387a 100755 (executable)
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-[[ "${BASH_SOURCE[0]}" != "${0}" ]] && echo "Please don't source ${BASH_SOURCE[0]}, execute it" && return
-
-CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-ROOT_PATH="${CURRENT_PATH}/../../"
+set -eo pipefail
+source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
 
 pushd ${ROOT_PATH} > /dev/null
 
index 76b13a3..0b98207 100755 (executable)
@@ -3,10 +3,10 @@
 # Test suite: ${ARCHIVE_PATH}/coverage-suite.tar.gz
 # NNPackage test suite: ${ARCHIVE_PATH}/nnpkg-test-suite.tar.gz (optional)
 
-[[ "${BASH_SOURCE[0]}" != "${0}" ]] && echo "Please don't source ${BASH_SOURCE[0]}, execute it" && return
+set -eo pipefail
+source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
 
-CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-ROOT_PATH="$CURRENT_PATH/../../"
+CheckTestPrepared
 
 NNAS_WORKSPACE=${NNAS_WORKSPACE:-build}
 if [[ -z "${ARCHIVE_PATH}" ]]; then
@@ -14,15 +14,6 @@ if [[ -z "${ARCHIVE_PATH}" ]]; then
   echo "Default archive directory including nncc package and resources: ${ARCHIVE_PATH}"
 fi
 
-# Model download server setting
-if [[ -z $MODELFILE_SERVER ]]; then
-  echo "Need model file server setting"
-  exit 1
-fi
-export MODELFILE_SERVER=$MODELFILE_SERVER
-
-set -e
-
 pushd $ROOT_PATH > /dev/null
 
 tar -zxf ${ARCHIVE_PATH}/coverage-suite.tar.gz -C ./
index 4653fe2..a8f36a4 100755 (executable)
@@ -5,10 +5,8 @@
 
 # Test suite: nnpkg-test-suite.tar.gz
 
-[[ "${BASH_SOURCE[0]}" != "${0}" ]] && echo "Please don't source ${BASH_SOURCE[0]}, execute it" && return
-
-CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-ROOT_PATH="${CURRENT_PATH}/../../"
+set -eo pipefail
+source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
 
 NNAS_WORKSPACE=${NNAS_WORKSPACE:-build}
 if [[ -z "${ARCHIVE_PATH}" ]]; then
@@ -16,8 +14,6 @@ if [[ -z "${ARCHIVE_PATH}" ]]; then
   echo "Default archive directory including nncc package and resources: ${ARCHIVE_PATH}"
 fi
 
-set -e
-
 pushd ${ROOT_PATH} > /dev/null
 
 RESOURCE_PATH=${NNAS_WORKSPACE}/tfmodel