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

[tests] Refactor scripts/ASTImportTest.sh. (#13576)

Browse Source 
* [tests] Refactor scripts/ASTImportTest.sh.

Co-authored-by: Nuno Santos <nuno.santos@ethereum.org>
Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
This commit is contained in:
Alexander Arlt
2022-11-24 16:16:16 +01:00
committed by GitHub
co-authored by Nuno Santos Kamil Śliwak
parent 0f3e7af30f
commit fe68200f30
3 changed files with 232 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/common.sh
+51 -15
View File
@@ -26,18 +26,18 @@ set -e
# changes directory. The paths returned by `caller` are relative to it.
_initial_work_dir=$(pwd)
if [ "$CIRCLECI" ]
if [[ -n ${CIRCLECI:-} ]]
then
export TERM="${TERM:-xterm}"
function printTask { echo "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; }
function printError { >&2 echo "$(tput setaf 1)$1$(tput setaf 7)"; }
function printWarning { >&2 echo "$(tput setaf 11)$1$(tput setaf 7)"; }
function printLog { echo "$(tput setaf 3)$1$(tput setaf 7)"; }
function printTask { echo -e "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; }
function printError { >&2 echo -e "$(tput setaf 1)$1$(tput setaf 7)"; }
function printWarning { >&2 echo -e "$(tput setaf 11)$1$(tput setaf 7)"; }
function printLog { echo -e "$(tput setaf 3)$1$(tput setaf 7)"; }
else
function printTask { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
function printError { >&2 echo "$(tput setaf 1)$1$(tput sgr0)"; }
function printWarning { >&2 echo "$(tput setaf 11)$1$(tput sgr0)"; }
function printLog { echo "$(tput setaf 3)$1$(tput sgr0)"; }
function printTask { echo -e "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
function printError { >&2 echo -e "$(tput setaf 1)$1$(tput sgr0)"; }
function printWarning { >&2 echo -e "$(tput setaf 11)$1$(tput sgr0)"; }
function printLog { echo -e "$(tput setaf 3)$1$(tput sgr0)"; }
fi
function checkDputEntries
@@ -75,9 +75,9 @@ function printStackTrace
# `caller` returns something that could already be printed as a stacktrace but we can make
# it more readable by rearranging the components.
# NOTE: This assumes that paths do not contain spaces.
lineNumber=$(caller "$frame" | cut --delimiter " " --field 1)
function=$(caller "$frame" | cut --delimiter " " --field 2)
file=$(caller "$frame" | cut --delimiter " " --field 3)
lineNumber=$(caller "$frame" | cut -d " " -f 1)
function=$(caller "$frame" | cut -d " " -f 2)
file=$(caller "$frame" | cut -d " " -f 3)
# Paths in the output from `caller` can be relative or absolute (depends on how the path
# with which the script was invoked) and if they're relative, they're not necessarily
@@ -193,16 +193,42 @@ function msg_on_error
fi
}
function diff_values
{
(( $# >= 2 )) || fail "diff_values requires at least 2 arguments."
local value1="$1"
local value2="$2"
shift
shift
shift 2
diff --unified=0 <(echo "$value1") <(echo "$value2") "$@"
if ! diff --unified=0 <(echo "$value1") <(echo "$value2") "$@"
then
if [[ -n ${DIFFVIEW:-} ]]
then
# Use user supplied diff view binary
"$DIFFVIEW" <(echo "$value1") <(echo "$value2")
fi
return 1
fi
}
function diff_files
{
(( $# >= 2 )) || fail "diff_files requires at least 2 arguments."
local file1="$1"
local file2="$2"
if ! diff "${file1}" "${file2}"
then
if [[ -n ${DIFFVIEW:-} ]]
then
# Use user supplied diff view binary
"$DIFFVIEW" "${file1}" "${file2}"
fi
return 1
fi
}
function safe_kill
@@ -277,3 +303,13 @@ function split_on_empty_lines_into_numbered_files
awk -v RS= "{print > (\"${path_prefix}_\"NR \"${path_suffix}\")}"
}
function command_available
{
local program="$1"
local parameters=${*:2}
if ! "${program}" "${parameters}" > /dev/null 2>&1
then
fail "'${program}' not found or not executed successfully with parameter(s) '${parameters}'. aborting."
fi
}