cerc-io/solidity
10
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

Merge pull request #12512 from ethereum/fix-trident-ext-test-after-preset-selection-pr

Browse Source 
Fix preset selection in Trident external test
This commit is contained in:
Kamil Śliwak 2022-01-10 22:16:08 +01:00 committed by GitHub
commit 10c954fd73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/externalTests/trident.sh
View File

@ -58,9 +58,8 @@ function trident_test
legacy-optimize-evm+yul legacy-optimize-evm+yul
) )
local selected_optimizer_presets [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}") print_presets_or_exit "$SELECTED_PRESETS"
print_optimizer_presets_or_exit "$selected_optimizer_presets"
setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH" setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
download_project "$repo" "$ref_type" "$ref" "$DIR" download_project "$repo" "$ref_type" "$ref" "$DIR"
@ -71,7 +70,7 @@ function trident_test
neutralize_package_json_hooks neutralize_package_json_hooks
force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH" force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
force_hardhat_compiler_settings "$config_file" "$(first_word "$selected_optimizer_presets")" "$config_var" force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
yarn install yarn install
replace_version_pragmas replace_version_pragmas
@ -89,7 +88,7 @@ function trident_test
# version check. It's not used by tests so we can remove it. # version check. It's not used by tests so we can remove it.
rm -r node_modules/@sushiswap/core/ rm -r node_modules/@sushiswap/core/
for preset in $selected_optimizer_presets; do for preset in $SELECTED_PRESETS; do
hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var" hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
done done
} }