mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Add switch for command line & test.sh to skip smt
- add --no-smt in scripts/tests.sh and test/cmdlineTests.sh Signed-off-by: soroosh-sdi <soroosh.sardari@gmail.com>
This commit is contained in:
parent
dea1b9ec79
commit
f5e8f5246c
@ -52,17 +52,32 @@ cleanup() {
|
|||||||
}
|
}
|
||||||
trap cleanup INT TERM
|
trap cleanup INT TERM
|
||||||
|
|
||||||
if [ "$1" = --junit_report ]
|
log_directory=""
|
||||||
then
|
no_smt=""
|
||||||
|
while [[ $# -gt 0 ]]
|
||||||
|
do
|
||||||
|
case "$1" in
|
||||||
|
--junit_report)
|
||||||
if [ -z "$2" ]
|
if [ -z "$2" ]
|
||||||
then
|
then
|
||||||
echo "Usage: $0 [--junit_report <report_directory>]"
|
echo "Usage: $0 [--junit_report <report_directory>] [--no-smt]"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
else
|
||||||
log_directory="$2"
|
log_directory="$2"
|
||||||
else
|
fi
|
||||||
log_directory=""
|
shift
|
||||||
fi
|
shift
|
||||||
|
;;
|
||||||
|
--no-smt)
|
||||||
|
no_smt="--no-smt"
|
||||||
|
SMT_FLAGS+=(--no-smt)
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Usage: $0 [--junit_report <report_directory>] [--no-smt]"
|
||||||
|
exit 1
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
printTask "Testing Python scripts..."
|
printTask "Testing Python scripts..."
|
||||||
"$REPO_ROOT/test/pyscriptTests.py"
|
"$REPO_ROOT/test/pyscriptTests.py"
|
||||||
@ -74,7 +89,7 @@ then
|
|||||||
"$REPO_ROOT/test/cmdlineTests.sh" &
|
"$REPO_ROOT/test/cmdlineTests.sh" &
|
||||||
CMDLINE_PID=$!
|
CMDLINE_PID=$!
|
||||||
else
|
else
|
||||||
if ! "$REPO_ROOT/test/cmdlineTests.sh"
|
if ! "$REPO_ROOT/test/cmdlineTests.sh" "$no_smt"
|
||||||
then
|
then
|
||||||
printError "Commandline tests FAILED"
|
printError "Commandline tests FAILED"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -37,8 +37,26 @@ source "${REPO_ROOT}/scripts/common.sh"
|
|||||||
# shellcheck source=scripts/common_cmdline.sh
|
# shellcheck source=scripts/common_cmdline.sh
|
||||||
source "${REPO_ROOT}/scripts/common_cmdline.sh"
|
source "${REPO_ROOT}/scripts/common_cmdline.sh"
|
||||||
|
|
||||||
AUTOUPDATE=false
|
autoupdate=false
|
||||||
[[ $1 == --update ]] && AUTOUPDATE=true && shift
|
no_smt=false
|
||||||
|
declare -a selected_tests
|
||||||
|
while [[ $# -gt 0 ]]
|
||||||
|
do
|
||||||
|
case "$1" in
|
||||||
|
--update)
|
||||||
|
autoupdate=true
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
--no-smt)
|
||||||
|
no_smt=true
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
selected_tests+=("$1")
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
case "$OSTYPE" in
|
case "$OSTYPE" in
|
||||||
msys)
|
msys)
|
||||||
@ -91,7 +109,7 @@ function ask_expectation_update
|
|||||||
local newExpectation="${1}"
|
local newExpectation="${1}"
|
||||||
local expectationFile="${2}"
|
local expectationFile="${2}"
|
||||||
|
|
||||||
if [[ $AUTOUPDATE == true ]]
|
if [[ $autoupdate == true ]]
|
||||||
then
|
then
|
||||||
update_expectation "$newExpectation" "$expectationFile"
|
update_expectation "$newExpectation" "$expectationFile"
|
||||||
else
|
else
|
||||||
@ -302,18 +320,11 @@ test_solc_behaviour "${0}" "ctx:=/some/remapping/target" "" "" 1 "" "Invalid rem
|
|||||||
printTask "Running general commandline tests..."
|
printTask "Running general commandline tests..."
|
||||||
(
|
(
|
||||||
cd "$REPO_ROOT"/test/cmdlineTests/
|
cd "$REPO_ROOT"/test/cmdlineTests/
|
||||||
for tdir in ${*:-*/}
|
(( ${#selected_tests[@]} > 0 )) || selected_tests=(*)
|
||||||
|
for tdir in "${selected_tests[@]}"
|
||||||
do
|
do
|
||||||
if ! [[ -d $tdir ]]; then
|
if ! [[ -d $tdir ]]; then
|
||||||
if [[ $tdir =~ ^--.*$ ]]; then
|
|
||||||
if [[ $tdir == "--update" ]]; then
|
|
||||||
printError "The --update option must be given before any positional arguments."
|
|
||||||
else
|
|
||||||
printError "Invalid option: $tdir."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
printError "Test directory not found: $tdir"
|
printError "Test directory not found: $tdir"
|
||||||
fi
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -321,6 +332,13 @@ printTask "Running general commandline tests..."
|
|||||||
|
|
||||||
# Strip trailing slash from $tdir.
|
# Strip trailing slash from $tdir.
|
||||||
tdir=$(basename "${tdir}")
|
tdir=$(basename "${tdir}")
|
||||||
|
if [[ $no_smt == true ]]
|
||||||
|
then
|
||||||
|
if [[ $tdir =~ .*model_checker_.* ]]; then
|
||||||
|
printWarning " --- > skipped"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
inputFiles="$(ls -1 "${tdir}/input."* 2> /dev/null || true)"
|
inputFiles="$(ls -1 "${tdir}/input."* 2> /dev/null || true)"
|
||||||
inputCount="$(echo "${inputFiles}" | wc -w)"
|
inputCount="$(echo "${inputFiles}" | wc -w)"
|
||||||
|
Loading…
Reference in New Issue
Block a user