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

Merge pull request #7975 from ethereum/solcjs-tests

Browse Source 
Use master branch of solc-js
This commit is contained in:
Leonardo 2019-12-11 19:02:00 +01:00 committed by GitHub
commit b9c35916e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/externalTests/common.sh
View File

@ -95,7 +95,7 @@ function truffle_setup
local repo="$1" local repo="$1"
local branch="$2" local branch="$2"
setup_solcjs "$DIR" "$SOLJSON" "master_060" "solc" setup_solcjs "$DIR" "$SOLJSON" "master" "solc"
download_project "$repo" "$branch" "$DIR" download_project "$repo" "$branch" "$DIR"
} }
@ -138,7 +138,7 @@ function force_solc_truffle_modules
if [ -d "$d" ]; then if [ -d "$d" ]; then
cd $d cd $d
rm -rf solc rm -rf solc
git clone --depth 1 -b master_060 https://github.com/ethereum/solc-js.git solc git clone --depth 1 -b master https://github.com/ethereum/solc-js.git solc
cp "$1" solc/soljson.js cp "$1" solc/soljson.js
fi fi
) )

2
test/externalTests/solc-js/solc-js.sh
View File

@ -35,7 +35,7 @@ function solcjs_test
SOLCJS_INPUT_DIR="$TEST_DIR"/test/externalTests/solc-js SOLCJS_INPUT_DIR="$TEST_DIR"/test/externalTests/solc-js
# set up solc-js on the branch specified # set up solc-js on the branch specified
setup master_060 setup master
printLog "Updating index.js file..." printLog "Updating index.js file..."
echo "require('./determinism.js');" >> test/index.js echo "require('./determinism.js');" >> test/index.js