diff options
| author | chriseth <chris@ethereum.org> | 2018-02-10 00:21:36 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2018-02-10 01:24:12 +0800 |
| commit | 981ff308ecfbd596d7f94852462591316bcaa2e7 (patch) | |
| tree | 23ba2beaae0b87402cdadf19f12b0431821cfa11 /scripts | |
| parent | 0a4dc2cc8679389ede7f3617edcab37b3a145880 (diff) | |
| download | dexon-solidity-981ff308ecfbd596d7f94852462591316bcaa2e7.tar.gz dexon-solidity-981ff308ecfbd596d7f94852462591316bcaa2e7.tar.zst dexon-solidity-981ff308ecfbd596d7f94852462591316bcaa2e7.zip | |
Split solcjs and external tests.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/test_emscripten.sh | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/scripts/test_emscripten.sh b/scripts/test_emscripten.sh index b659e5e5..a0827138 100755 --- a/scripts/test_emscripten.sh +++ b/scripts/test_emscripten.sh @@ -31,31 +31,7 @@ set -e REPO_ROOT=$(cd $(dirname "$0")/.. && pwd) SOLJSON="$REPO_ROOT/build/libsolc/soljson.js" -DIR=$(mktemp -d) -( - echo "Preparing solc-js..." - git clone --depth 1 https://github.com/ethereum/solc-js "$DIR" - cd "$DIR" - # disable "prepublish" script which downloads the latest version - # (we will replace it anyway and it is often incorrectly cached - # on travis) - npm config set script.prepublish '' - npm install - - # Replace soljson with current build - echo "Replacing soljson.js" - rm -f soljson.js - cp "$SOLJSON" soljson.js - - # Update version (needed for some tests) - VERSION=$("$REPO_ROOT/scripts/get_version.sh") - echo "Updating package.json to version $VERSION" - npm version --no-git-tag-version $VERSION - - echo "Running solc-js tests..." - npm run test -) -rm -rf "$DIR" - +echo "Running solcjs tests...." +"$REPO_ROOT/test/solcjsTests.sh" "$SOLJSON" echo "Running external tests...." "$REPO_ROOT/test/externalTests.sh" "$SOLJSON" |