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

Quote stuff properly

Browse Source
This commit is contained in:
Kamil Śliwak
2021-02-01 17:14:38 +01:00
parent 566d49a1d1
commit 27754d3e3d
27 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/cmdlineTests.sh
+15 -15
View File
@@ -30,7 +30,7 @@ set -e
## GLOBAL VARIABLES
REPO_ROOT=$(cd $(dirname "$0")/.. && pwd)
REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
source "${REPO_ROOT}/scripts/common.sh"
source "${REPO_ROOT}/scripts/common_cmdline.sh"
@@ -185,13 +185,13 @@ function test_solc_behaviour()
[[ $exit_code_expectation_file == "" ]] && exit 1
fi
if [[ "$(cat $stdout_path)" != "${stdout_expected}" ]]
if [[ "$(cat "$stdout_path")" != "${stdout_expected}" ]]
then
printError "Incorrect output on stdout received. Expected:"
echo -e "${stdout_expected}"
printError "But got:"
echo -e "$(cat $stdout_path)"
echo -e "$(cat "$stdout_path")"
printError "When running $solc_command"
@@ -199,13 +199,13 @@ function test_solc_behaviour()
[[ $stdout_expectation_file == "" ]] && exit 1
fi
if [[ "$(cat $stderr_path)" != "${stderr_expected}" ]]
if [[ "$(cat "$stderr_path")" != "${stderr_expected}" ]]
then
printError "Incorrect output on stderr received. Expected:"
echo -e "${stderr_expected}"
printError "But got:"
echo -e "$(cat $stderr_path)"
echo -e "$(cat "$stderr_path")"
printError "When running $solc_command"
@@ -223,14 +223,14 @@ function test_solc_assembly_output()
local expected="${2}"
local solc_args="${3}"
local expected_object="object \"object\" { code "${expected}" }"
local expected_object="object \"object\" { code ${expected} }"
output=$(echo "${input}" | "$SOLC" - ${solc_args} 2>/dev/null)
empty=$(echo "$output" | tr '\n' ' ' | tr -s ' ' | sed -ne "/${expected_object}/p")
if [ -z "$empty" ]
then
printError "Incorrect assembly output. Expected: "
echo -e ${expected}
echo -e "${expected}"
printError "with arguments ${solc_args}, but got:"
echo "${output}"
exit 1
@@ -279,8 +279,8 @@ printTask "Running general commandline tests..."
# Strip trailing slash from $tdir.
tdir=$(basename "${tdir}")
inputFiles="$(ls -1 ${tdir}/input.* 2> /dev/null || true)"
inputCount="$(echo ${inputFiles} | wc -w)"
inputFiles="$(ls -1 "${tdir}/input."* 2> /dev/null || true)"
inputCount="$(echo "${inputFiles}" | wc -w)"
if (( ${inputCount} > 1 ))
then
printError "Ambiguous input. Found input files in multiple formats:"
@@ -300,18 +300,18 @@ printTask "Running general commandline tests..."
then
stdin="${inputFile}"
inputFile=""
stdout="$(cat ${tdir}/output.json 2>/dev/null || true)"
stdout="$(cat "${tdir}/output.json" 2>/dev/null || true)"
stdoutExpectationFile="${tdir}/output.json"
args="--standard-json "$(cat ${tdir}/args 2>/dev/null || true)
args="--standard-json "$(cat "${tdir}/args" 2>/dev/null || true)
else
stdin=""
stdout="$(cat ${tdir}/output 2>/dev/null || true)"
stdout="$(cat "${tdir}/output" 2>/dev/null || true)"
stdoutExpectationFile="${tdir}/output"
args=$(cat ${tdir}/args 2>/dev/null || true)
args=$(cat "${tdir}/args" 2>/dev/null || true)
fi
exitCodeExpectationFile="${tdir}/exit"
exitCode=$(cat "$exitCodeExpectationFile" 2>/dev/null || true)
err="$(cat ${tdir}/err 2>/dev/null || true)"
err="$(cat "${tdir}/err" 2>/dev/null || true)"
stderrExpectationFile="${tdir}/err"
test_solc_behaviour "$inputFile" \
"$args" \
@@ -478,7 +478,7 @@ printTask "Testing AST import..."
SOLTMPDIR=$(mktemp -d)
(
cd "$SOLTMPDIR"
$REPO_ROOT/scripts/ASTImportTest.sh
"$REPO_ROOT/scripts/ASTImportTest.sh"
if [ $? -ne 0 ]
then
rm -rf "$SOLTMPDIR"