Revise coverage build and report script (#3661)

Revise docker_cross_test_coverage_build.sh and docker_coverage_report.sh
- Remove using nnfw_docker file
- Remove deprecated environment variable setting
- Use docker-run-user command

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/scripts/command/docker_coverage_report.sh b/scripts/command/docker_coverage_report.sh
index c9294fe..e4d3a92 100755 (executable)
--- a/scripts/command/docker_coverage_report.sh
+++ b/scripts/command/docker_coverage_report.sh
@@ -1,24 +1,9 @@
 #!/bin/bash
 
-SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DOCKER_ENV_VARS+=" -e SRC_PREFIX=${NNFW_PROJECT_PATH}"
 
-# DOCKER_HOME and DOCKER_ENV_VARS
-source $SCRIPT_ROOT/nnfw_docker
+pushd ${NNFW_PROJECT_PATH} > /dev/null
 
-HOST_HOME=$SCRIPT_ROOT/../..
-
-DOCKER_VOLUMES+=" -v $HOST_HOME:$DOCKER_HOME"
-
-DOCKER_RUN_OPTS="--rm"
-DOCKER_RUN_OPTS+=" -w $DOCKER_HOME"
-DOCKER_ENV_VARS+=" -e DOCKER_HOME=${DOCKER_HOME}"
-
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "./scripts/command/gen_coverage_report.sh"
-
-BUILD_RESULT=$?
-
-source $SCRIPT_ROOT/../docker_helper
-restore_ownership $HOST_HOME $DOCKER_HOME
-
-exit $BUILD_RESULT
+source run docker-run-user bash -c "./run gen_coverage_report.sh"
 
+popd > /dev/null

diff --git a/scripts/command/docker_cross_test_coverage_build.sh b/scripts/command/docker_cross_test_coverage_build.sh
index 784b846..8d8e108 100755 (executable)
--- a/scripts/command/docker_cross_test_coverage_build.sh
+++ b/scripts/command/docker_cross_test_coverage_build.sh
@@ -1,22 +1,10 @@
 #!/bin/bash
 
-SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# DOCKER_HOME and DOCKER_ENV_VARS
-source $SCRIPT_ROOT/nnfw_docker
-
-HOST_HOME=$SCRIPT_ROOT/../..
-
-DOCKER_VOLUMES+=" -v $HOST_HOME:$DOCKER_HOME"
-
 DOCKER_ENV_VARS+=" -e TARGET_ARCH=armv7l"
 DOCKER_ENV_VARS+=" -e CROSS_BUILD=1"
 DOCKER_ENV_VARS+=" -e ROOTFS_DIR=/opt/rootfs"
 DOCKER_ENV_VARS+=" -e COVERAGE_BUILD=1"
 
-DOCKER_RUN_OPTS="--rm"
-DOCKER_RUN_OPTS+=" -w $DOCKER_HOME"
-
 # prepare rootfs
 if [[ ! -d $ROOTFS_DIR ]]; then
   echo "cannot find rootfs"
@@ -25,17 +13,9 @@ fi
 
 DOCKER_VOLUMES+=" -v $ROOTFS_DIR:/opt/rootfs"
 
-if [ -n "$DOCKER_INTERACTIVE" ]; then
-  DOCKER_RUN_OPTS+=" -it"
-  CMD="/bin/bash"
-else
-  CMD="make acl && make && make install && make build_coverage_suite"
-fi
-
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD"
-BUILD_RESULT=$?
+pushd $NNFW_PROJECT_PATH > /dev/null
 
-source $SCRIPT_ROOT/../docker_helper
-restore_ownership $HOST_HOME $DOCKER_HOME
+CMD="make acl && make && make install && make build_coverage_suite"
+source run docker-run-user bash -c "${CMD}"
 
-exit $BUILD_RESULT
+popd > /dev/null