Run more tests on istanbul.

This commit is contained in:
chriseth 2019-11-11 18:00:16 +01:00 committed by Alex Beregszaszi
parent e912c7dca8
commit 0033d63522
2 changed files with 4 additions and 4 deletions

View File

@ -81,7 +81,7 @@ EVM_VERSIONS="homestead byzantium"
if [ -z "$CI" ] if [ -z "$CI" ]
then then
EVM_VERSIONS+=" constantinople petersburg" EVM_VERSIONS+=" constantinople petersburg istanbul"
fi fi
# And then run the Solidity unit-tests in the matrix combination of optimizer / no optimizer # And then run the Solidity unit-tests in the matrix combination of optimizer / no optimizer
@ -91,9 +91,9 @@ do
for vm in $EVM_VERSIONS for vm in $EVM_VERSIONS
do do
FORCE_ABIV2_RUNS="no" FORCE_ABIV2_RUNS="no"
if [[ "$vm" == "constantinople" ]] if [[ "$vm" == "istanbul" ]]
then then
FORCE_ABIV2_RUNS="no yes" # run both in constantinople FORCE_ABIV2_RUNS="no yes" # run both in istanbul
fi fi
for abiv2 in $FORCE_ABIV2_RUNS for abiv2 in $FORCE_ABIV2_RUNS
do do

View File

@ -207,7 +207,7 @@ function run_test
for optimize in "${optimizer_settings[@]}" for optimize in "${optimizer_settings[@]}"
do do
clean clean
force_solc_settings "$CONFIG" "$optimize" "petersburg" force_solc_settings "$CONFIG" "$optimize" "istanbul"
# Force ABIEncoderV2 in the last step. Has to be the last because code is modified. # Force ABIEncoderV2 in the last step. Has to be the last because code is modified.
if [ "$FORCE_ABIv2" = true ]; then if [ "$FORCE_ABIv2" = true ]; then
[[ "$optimize" =~ yul ]] && force_abi_v2 [[ "$optimize" =~ yul ]] && force_abi_v2