From fb253e8ddf5cc882769420ca0ed8f14131c758de Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Wed, 22 Jan 2020 11:59:47 +0800 Subject: vboot: unify common.sh for testing scripts Use tests/common.sh instead of tests/futility/common.sh. Correct SCRIPT_DIR value to allow running run_test_scripts.sh standalone without using Makefile. BUG=b:124141368, chromium:605348 TEST=make clean && make runfutiltests BRANCH=none Change-Id: I107952826ea9a3a3816d9c13206aa48bee63ac6c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2014236 Tested-by: Joel Kitching Commit-Queue: Joel Kitching Reviewed-by: Julius Werner --- tests/common.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/common.sh') diff --git a/tests/common.sh b/tests/common.sh index 4da9e443..e69692b6 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -5,22 +5,22 @@ # found in the LICENSE file. # Determine script directory. -SCRIPT_DIR=$(dirname $(readlink -f "$0")) -ROOT_DIR="$(dirname ${SCRIPT_DIR})" +SCRIPT_DIR="$(dirname $(realpath "${BASH_SOURCE[0]}"))" +ROOT_DIR="$(dirname "${SCRIPT_DIR}")" SRCDIR="${SRCDIR:-${ROOT_DIR}}" BUILD="${BUILD:-${ROOT_DIR}/build}" BUILD_RUN="${BUILD_RUN:-${BUILD}}" SRC_RUN="${SRC_RUN:-${SRCDIR}}" BUILD_DIR="${BUILD}" -BIN_DIR=${BUILD_DIR}/install_for_test/usr/bin -FUTILITY=${BIN_DIR}/futility +BIN_DIR="${BUILD_DIR}/install_for_test/usr/bin" +FUTILITY="${BIN_DIR}/futility" TEST_DIR="${BUILD_DIR}/tests" -TESTKEY_DIR=${SCRIPT_DIR}/testkeys -TESTCASE_DIR=${SCRIPT_DIR}/testcases -TESTKEY_SCRATCH_DIR=${TEST_DIR}/testkeys +TESTKEY_DIR="${SCRIPT_DIR}/testkeys" +TESTCASE_DIR="${SCRIPT_DIR}/testcases" +TESTKEY_SCRATCH_DIR="${TEST_DIR}/testkeys" if [ ! -d ${TESTKEY_SCRATCH_DIR} ]; then - mkdir -p ${TESTKEY_SCRATCH_DIR} + mkdir -p ${TESTKEY_SCRATCH_DIR} fi # Color output encodings. -- cgit v1.2.1