diff options
| -rwxr-xr-x | scripts/bytecodecompare/storebytecode.sh | 3 | ||||
| -rwxr-xr-x | test/externalTests.sh | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh index 557e3275..89a669bd 100755 --- a/scripts/bytecodecompare/storebytecode.sh +++ b/scripts/bytecodecompare/storebytecode.sh @@ -40,8 +40,9 @@ TMPDIR=$(mktemp -d) if [[ "$SOLC_EMSCRIPTEN" = "On" ]] then + # npm install solc + git clone --depth 1 https://github.com/ethereum/solc-js.git solc cp "$REPO_ROOT/build/libsolc/soljson.js" . - npm install solc cat > solc <<EOF #!/usr/bin/env node var process = require('process') 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" |