cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use Bash arrays for variables containing multiple space-separated values

Browse Source
This commit is contained in:
Kamil Śliwak
2021-02-02 15:45:24 +01:00
parent c19464f908
commit 4a7d494d3c
8 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/tests.sh
+8 -7
View File
@@ -30,6 +30,7 @@ set -e
REPO_ROOT="$(dirname "$0")/.."
SOLIDITY_BUILD_DIR="${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}"
IFS=" " read -r -a SMT_FLAGS <<< "$SMT_FLAGS"
source "${REPO_ROOT}/scripts/common.sh"
@@ -100,21 +101,21 @@ do
fi
for abiv1 in $FORCE_ABIV1_RUNS
do
force_abiv1_flag=""
force_abiv1_flag=()
if [[ "$abiv1" == "yes" ]]
then
force_abiv1_flag="--abiencoderv1"
force_abiv1_flag=(--abiencoderv1)
fi
printTask "--> Running tests using $optimize --evm-version $vm $force_abiv1_flag..."
printTask "--> Running tests using $optimize --evm-version $vm ${force_abiv1_flag[*]}..."
log=""
log=()
if [ -n "$log_directory" ]
then
if [ -n "$optimize" ]
then
log=--logger=JUNIT,error,$log_directory/opt_$vm.xml
log+=("--logger=JUNIT,error,$log_directory/opt_$vm.xml")
else
log=--logger=JUNIT,error,$log_directory/noopt_$vm.xml
log+=("--logger=JUNIT,error,$log_directory/noopt_$vm.xml")
fi
fi
@@ -122,7 +123,7 @@ do
[ "${vm}" = "byzantium" ] && [ "${optimize}" = "" ] && EWASM_ARGS="--ewasm"
set +e
"${SOLIDITY_BUILD_DIR}"/test/soltest --show-progress $log -- ${EWASM_ARGS} --testpath "$REPO_ROOT"/test "$optimize" --evm-version "$vm" $SMT_FLAGS $force_abiv1_flag
"${SOLIDITY_BUILD_DIR}"/test/soltest --show-progress "${log[@]}" -- ${EWASM_ARGS} --testpath "$REPO_ROOT"/test "$optimize" --evm-version "$vm" "${SMT_FLAGS[@]}" "${force_abiv1_flag[@]}"
if test "0" -ne "$?"; then
exit 1