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

Fixes solc path override in Truffle config.

Browse Source
This commit is contained in:
Erik Kundt 2019-11-28 22:12:42 +01:00 committed by Daniel Kirchner
parent 3f00a0fc8c
commit 40b58adcdb
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/externalTests/colony.sh
View File

@ -32,11 +32,11 @@ function colony_test
{ {
OPTIMIZER_LEVEL=3 OPTIMIZER_LEVEL=3
FORCE_ABIv2=false FORCE_ABIv2=false
CONFIG="truffle.js"
truffle_setup https://github.com/erak/colonyNetwork.git develop_060 truffle_setup https://github.com/erak/colonyNetwork.git develop_060
run_install install_fn run_install install_fn
CONFIG=$(find_truffle_config)
cd lib cd lib
rm -Rf dappsys rm -Rf dappsys
git clone https://github.com/erak/dappsys-monolithic.git -b master_060 dappsys git clone https://github.com/erak/dappsys-monolithic.git -b master_060 dappsys

5
test/externalTests/common.sh
View File

@ -202,6 +202,10 @@ function run_install
{ {
local init_fn="$1" local init_fn="$1"
printLog "Running install function..." printLog "Running install function..."
replace_version_pragmas
force_solc "$CONFIG" "$DIR" "$SOLJSON"
$init_fn $init_fn
} }
@ -225,7 +229,6 @@ function truffle_run_test
local test_fn="$2" local test_fn="$2"
replace_version_pragmas replace_version_pragmas
force_solc "$CONFIG" "$DIR" "$SOLJSON" force_solc "$CONFIG" "$DIR" "$SOLJSON"
printLog "Checking optimizer level..." printLog "Checking optimizer level..."

3
test/externalTests/gnosis.sh
View File

@ -31,10 +31,11 @@ function test_fn { npm test; }
function gnosis_safe_test function gnosis_safe_test
{ {
OPTIMIZER_LEVEL=1 OPTIMIZER_LEVEL=1
CONFIG="truffle.js"
truffle_setup https://github.com/erak/safe-contracts.git development_060 truffle_setup https://github.com/erak/safe-contracts.git development_060
run_install install_fn run_install install_fn
CONFIG=$(find_truffle_config)
replace_libsolc_call replace_libsolc_call
truffle_run_test compile_fn test_fn truffle_run_test compile_fn test_fn

4
test/externalTests/zeppelin.sh
View File

@ -31,11 +31,11 @@ function test_fn { npm run test; }
function zeppelin_test function zeppelin_test
{ {
OPTIMIZER_LEVEL=1 OPTIMIZER_LEVEL=1
CONFIG="truffle-config.js"
truffle_setup https://github.com/erak/openzeppelin-contracts.git master_060 truffle_setup https://github.com/erak/openzeppelin-contracts.git master_060
run_install install_fn run_install install_fn
CONFIG="truffle-config.js"
replace_libsolc_call
truffle_run_test compile_fn test_fn truffle_run_test compile_fn test_fn
} }