diff options
| author | chriseth <chris@ethereum.org> | 2018-10-31 20:39:32 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2018-11-13 21:54:01 +0800 |
| commit | 28d98d61ef5484a3c7e8edc75f99d02b6a8ff2ed (patch) | |
| tree | 147c9e20f0214a5e330c5455ff801734af18043c /test | |
| parent | b6c32577523914332ce780928941e197e68eaa00 (diff) | |
| download | dexon-solidity-28d98d61ef5484a3c7e8edc75f99d02b6a8ff2ed.tar dexon-solidity-28d98d61ef5484a3c7e8edc75f99d02b6a8ff2ed.tar.gz dexon-solidity-28d98d61ef5484a3c7e8edc75f99d02b6a8ff2ed.tar.bz2 dexon-solidity-28d98d61ef5484a3c7e8edc75f99d02b6a8ff2ed.tar.lz dexon-solidity-28d98d61ef5484a3c7e8edc75f99d02b6a8ff2ed.tar.xz dexon-solidity-28d98d61ef5484a3c7e8edc75f99d02b6a8ff2ed.tar.zst dexon-solidity-28d98d61ef5484a3c7e8edc75f99d02b6a8ff2ed.zip | |
Use latest solcjs and replace compileStandard by compile.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/externalTests.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/test/externalTests.sh b/test/externalTests.sh index 0168fb03..93581925 100755 --- a/test/externalTests.sh +++ b/test/externalTests.sh @@ -55,7 +55,16 @@ function test_truffle cd "$DIR" echo "Current commit hash: `git rev-parse HEAD`" npm install - find . -name soljson.js -exec cp "$SOLJSON" {} \; + # Replace solc package by master + for d in node_modules node_modules/truffle/node_modules + do + ( + cd $d + rm -rf solc + git clone --depth 1 https://github.com/ethereum/solc-js.git solc + cp "$SOLJSON" solc/ + ) + done if [ "$name" == "Zeppelin" -o "$name" == "Gnosis" ]; then echo "Replaced fixed-version pragmas..." # Replace fixed-version pragmas in Gnosis (part of Consensys best practice) @@ -68,6 +77,8 @@ function test_truffle rm "$assertsol" wget https://raw.githubusercontent.com/trufflesuite/truffle-core/ef31bcaa15dbd9bd0f6a0070a5c63f271cde2dbc/lib/testing/Assert.sol -o "$assertsol" fi + # Change "compileStandard" to "compile" + sed -i s/solc.compileStandard/solc.compile/ "node_modules/truffle/build/cli.bundled.js" npm run test ) rm -rf "$DIR" |