JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Shellchecked script and eliminated redirect

Browse Source
This commit is contained in:
Michael Tryby
2019-03-07 11:03:41 -05:00
parent 93363dccfc
commit 8d1b490458
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tools/before-test.sh
View File

@@ -22,30 +22,30 @@
# before-test.sh and gen-config.sh are located together in the same folder. # before-test.sh and gen-config.sh are located together in the same folder.
if [ -z $1 ]; then if [ -z "$1" ]; then
unset PLATFORM; unset PLATFORM;
else else
PLATFORM=$1; PLATFORM=$1;
fi fi
if [ -z $2 ]; then if [ -z "$2" ]; then
echo "ERROR: REF_BUILD_ID must be defined"; exit 1; echo "ERROR: REF_BUILD_ID must be defined"; exit 1;
else else
REF_BUILD_ID=$2; REF_BUILD_ID=$2;
fi fi
if [ -z $3 ]; then if [ -z "$3" ]; then
SUT_BUILD_ID="local"; SUT_BUILD_ID="local";
else else
SUT_BUILD_ID=$3; SUT_BUILD_ID=$3;
fi fi
if [ -z $4 ]; then if [ -z "$4" ]; then
SUT_VERSION="unknown"; SUT_VERSION="unknown";
else else
SUT_VERSION=$4; fi SUT_VERSION=$4; fi
if [ -z $5 ]; then if [ -z "$5" ]; then
TEST_HOME="nrtestsuite"; TEST_HOME="nrtestsuite";
else else
TEST_HOME=$5; fi TEST_HOME=$5; fi
@@ -58,25 +58,26 @@ SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BUILD_HOME="$(dirname "$SCRIPT_HOME")" BUILD_HOME="$(dirname "$SCRIPT_HOME")"
SUT_PATH=(`find $BUILD_HOME -name "bin" -type d`) SUT_PATH="$(find "$BUILD_HOME" -name "bin" -type d)"
# TODO: determine platform # TODO: determine platform
# hack to determine latest tag from GitHub # hack to determine latest tag from GitHub
LATEST_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/latest" LATEST_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/latest"
temp_url=$(curl -sI ${LATEST_URL} | grep -iE "^Location:") temp_url="$(curl -sI "${LATEST_URL}" | grep -iE "^Location:")"
LATEST_TAG=${temp_url##*/} LATEST_TAG="${temp_url##*/}"
TEST_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/${LATEST_TAG}.tar.gz" TEST_URL="https://codeload.github.com/OpenWaterAnalytics/epanet-example-networks/tar.gz/${LATEST_TAG}"
BENCH_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/download/${LATEST_TAG}/benchmark-${PLATFORM}-${REF_BUILD_ID}.tar.gz" BENCH_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/download/${LATEST_TAG}/benchmark-${PLATFORM}-${REF_BUILD_ID}.tar.gz"
# create a clean directory for staging regression tests # create a clean directory for staging regression tests
if [ -d ${TEST_HOME} ]; then # create a clean directory for staging regression tests
rm -rf ${TEST_HOME} if [ -d "${TEST_HOME}" ]; then
rm -rf "${TEST_HOME}"
fi fi
mkdir ${TEST_HOME} mkdir "${TEST_HOME}"
cd ${TEST_HOME} cd "${TEST_HOME}" || exit 1
# retrieve epanet-examples for regression testing # retrieve epanet-examples for regression testing
@@ -91,7 +92,7 @@ fi
# extract tests, benchmarks, and manifest # extract tests, benchmarks, and manifest
tar xzf examples.tar.gz tar xzf examples.tar.gz
ln -s epanet-example-networks-${LATEST_TAG:1}/epanet-tests tests ln -s "epanet-example-networks-${LATEST_TAG:1}/epanet-tests" tests
mkdir benchmark mkdir benchmark
tar xzf benchmark.tar.gz -C benchmark tar xzf benchmark.tar.gz -C benchmark
@@ -100,4 +101,4 @@ tar xzf benchmark.tar.gz --wildcards --no-anchored --strip-components=1 '*/manif
# generate json configuration file for software under test # generate json configuration file for software under test
mkdir apps mkdir apps
${SCRIPT_HOME}/gen-config.sh ${SUT_PATH} ${PLATFORM} ${SUT_BUILD_ID} ${SUT_VERSION} > apps/epanet-${SUT_BUILD_ID}.json "${SCRIPT_HOME}/gen-config.sh" "${SUT_PATH}" "${PLATFORM}" "${SUT_BUILD_ID}" "${SUT_VERSION}" > "apps/epanet-${SUT_BUILD_ID}.json"