From e8749decf566499afd65d477fe864f987673f7fd Mon Sep 17 00:00:00 2001 From: Bhargava Shastry Date: Mon, 4 Nov 2019 09:48:35 +0100 Subject: [PATCH] circleci: Expose soltest flags explicitly --- .circleci/config.yml | 2 +- .circleci/soltest.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f34d3717c..47a774356 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -568,7 +568,7 @@ jobs: environment: EVM: constantinople OPTIMIZE: 0 - flags: --no-smt + SOLTEST_FLAGS: --no-smt ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2 t_ems_solcjs: diff --git a/.circleci/soltest.sh b/.circleci/soltest.sh index 41f08db77..0f8408f59 100755 --- a/.circleci/soltest.sh +++ b/.circleci/soltest.sh @@ -12,6 +12,7 @@ # EVM=version_string Specifies EVM version to compile for (such as homestead, etc) # OPTIMIZE=1 Enables backend optimizer # ABI_ENCODER_V2=1 Enables ABI encoder version 2 +# SOLTEST_FLAGS= Appends to default SOLTEST_ARGS # # ------------------------------------------------------------------------------ # This file is part of solidity. @@ -54,7 +55,7 @@ get_logfile_basename() { } BOOST_TEST_ARGS="--color_output=no --show_progress=yes --logger=JUNIT,error,test_results/`get_logfile_basename`.xml" -SOLTEST_ARGS="--evm-version=$EVM --evmonepath /usr/lib/libevmone.so $flags" +SOLTEST_ARGS="--evm-version=$EVM --evmonepath /usr/lib/libevmone.so $SOLTEST_FLAGS" test "${OPTIMIZE}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --optimize" test "${ABI_ENCODER_V2}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --abiencoderv2 --optimize-yul"