diff options
Diffstat (limited to 'scripts/test_emscripten.sh')
| -rwxr-xr-x | scripts/test_emscripten.sh | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/scripts/test_emscripten.sh b/scripts/test_emscripten.sh index b659e5e5..1804f23a 100755 --- a/scripts/test_emscripten.sh +++ b/scripts/test_emscripten.sh @@ -30,32 +30,9 @@ set -e REPO_ROOT=$(cd $(dirname "$0")/.. && pwd) SOLJSON="$REPO_ROOT/build/libsolc/soljson.js" +VERSION=$("$REPO_ROOT"/scripts/get_version.sh) -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" "$VERSION" echo "Running external tests...." "$REPO_ROOT/test/externalTests.sh" "$SOLJSON" |