Skip to content

Commit 10c954f

Browse files
authored
Merge pull request #12512 from ethereum/fix-trident-ext-test-after-preset-selection-pr
Fix preset selection in Trident external test
2 parents 4842774 + 823f0da commit 10c954f

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

test/externalTests/trident.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ function trident_test
5858
legacy-optimize-evm+yul
5959
)
6060

61-
local selected_optimizer_presets
62-
selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
63-
print_optimizer_presets_or_exit "$selected_optimizer_presets"
61+
[[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
62+
print_presets_or_exit "$SELECTED_PRESETS"
6463

6564
setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
6665
download_project "$repo" "$ref_type" "$ref" "$DIR"
@@ -71,7 +70,7 @@ function trident_test
7170

7271
neutralize_package_json_hooks
7372
force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
74-
force_hardhat_compiler_settings "$config_file" "$(first_word "$selected_optimizer_presets")" "$config_var"
73+
force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
7574
yarn install
7675

7776
replace_version_pragmas
@@ -89,7 +88,7 @@ function trident_test
8988
# version check. It's not used by tests so we can remove it.
9089
rm -r node_modules/@sushiswap/core/
9190

92-
for preset in $selected_optimizer_presets; do
91+
for preset in $SELECTED_PRESETS; do
9392
hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
9493
done
9594
}

0 commit comments

Comments
 (0)