diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh index 0c3922272..66231eb99 100755 --- a/test/externalTests/colony.sh +++ b/test/externalTests/colony.sh @@ -32,14 +32,14 @@ function colony_test { OPTIMIZER_LEVEL=3 FORCE_ABIv2=false + CONFIG="truffle.js" + truffle_setup https://github.com/erak/colonyNetwork.git develop_060 run_install install_fn - CONFIG=$(find_truffle_config) - cd lib rm -Rf dappsys - git clone https://github.com/erak/dappsys-monolithic.git -b callvalue-payable-fix dappsys + git clone https://github.com/erak/dappsys-monolithic.git -b master_060 dappsys cd .. truffle_run_test compile_fn test_fn diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh index c719cb92d..25b4a6068 100644 --- a/test/externalTests/common.sh +++ b/test/externalTests/common.sh @@ -83,6 +83,13 @@ function download_project echo "Current commit hash: `git rev-parse HEAD`" } +function force_truffle_version +{ + local repo="$1" + + sed -i 's/"truffle":\s*".*"/"truffle": "^5.0.42"/g' package.json +} + function truffle_setup { local repo="$1" @@ -202,6 +209,10 @@ function run_install { local init_fn="$1" printLog "Running install function..." + + replace_version_pragmas + force_solc "$CONFIG" "$DIR" "$SOLJSON" + $init_fn } @@ -225,7 +236,6 @@ function truffle_run_test local test_fn="$2" replace_version_pragmas - force_solc "$CONFIG" "$DIR" "$SOLJSON" printLog "Checking optimizer level..." diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh index 8c4f88d87..b2bb657cb 100755 --- a/test/externalTests/gnosis.sh +++ b/test/externalTests/gnosis.sh @@ -31,10 +31,14 @@ function test_fn { npm test; } function gnosis_safe_test { OPTIMIZER_LEVEL=1 - truffle_setup https://github.com/erak/safe-contracts.git development_060 - run_install install_fn + CONFIG="truffle.js" - CONFIG=$(find_truffle_config) + truffle_setup https://github.com/erak/safe-contracts.git development_060 + + force_truffle_version + sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:erak/mock-contract#master_060|g' package.json + + run_install install_fn replace_libsolc_call truffle_run_test compile_fn test_fn diff --git a/test/externalTests/solc-js/solc-js.sh b/test/externalTests/solc-js/solc-js.sh index daffee0e3..611f989db 100755 --- a/test/externalTests/solc-js/solc-js.sh +++ b/test/externalTests/solc-js/solc-js.sh @@ -49,8 +49,6 @@ function solcjs_test printLog "Copying SMTChecker tests..." cp -Rf "$TEST_DIR"/test/libsolidity/smtCheckerTests test/ - run_install install_fn - # Update version (needed for some tests) echo "Updating package.json to version $VERSION" npm version --allow-same-version --no-git-tag-version $VERSION diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh index d4a909636..7c932786e 100755 --- a/test/externalTests/zeppelin.sh +++ b/test/externalTests/zeppelin.sh @@ -31,11 +31,11 @@ function test_fn { npm run test; } function zeppelin_test { OPTIMIZER_LEVEL=1 - truffle_setup https://github.com/erak/openzeppelin-solidity.git master_060 + CONFIG="truffle-config.js" + + truffle_setup https://github.com/erak/openzeppelin-contracts.git master_060 run_install install_fn - CONFIG="truffle-config.js" - replace_libsolc_call truffle_run_test compile_fn test_fn }