diff options
| author | chriseth <chris@ethereum.org> | 2018-02-10 01:08:29 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2018-02-10 01:24:12 +0800 |
| commit | 937f16afef910f6faf1e29a7dafb5c7c699e4de9 (patch) | |
| tree | 0b32b3357a03e4ea24f80f05ecfbf756bbca31dc | |
| parent | 981ff308ecfbd596d7f94852462591316bcaa2e7 (diff) | |
| download | dexon-solidity-937f16afef910f6faf1e29a7dafb5c7c699e4de9.tar dexon-solidity-937f16afef910f6faf1e29a7dafb5c7c699e4de9.tar.gz dexon-solidity-937f16afef910f6faf1e29a7dafb5c7c699e4de9.tar.bz2 dexon-solidity-937f16afef910f6faf1e29a7dafb5c7c699e4de9.tar.lz dexon-solidity-937f16afef910f6faf1e29a7dafb5c7c699e4de9.tar.xz dexon-solidity-937f16afef910f6faf1e29a7dafb5c7c699e4de9.tar.zst dexon-solidity-937f16afef910f6faf1e29a7dafb5c7c699e4de9.zip | |
Handle version for solcjs tests.
| -rw-r--r-- | circle.yml | 4 | ||||
| -rwxr-xr-x | scripts/test_emscripten.sh | 3 | ||||
| -rwxr-xr-x | test/solcjsTests.sh | 6 |
3 files changed, 8 insertions, 5 deletions
@@ -30,10 +30,12 @@ jobs: destination: soljson.js - run: mkdir -p workspace - run: cp build/libsolc/soljson.js workspace/soljson.js + - run: scripts/get_version.sh > workspace/version.txt - persist_to_workspace: root: workspace paths: - soljson.js + - version.txt test_emscripten_solcjs: docker: - image: trzeci/emscripten:sdk-tag-1.37.21-64bit @@ -57,7 +59,7 @@ jobs: name: Test solcjs command: | . /usr/local/nvm/nvm.sh - test/solcjsTests.sh /tmp/workspace/soljson.js + test/solcjsTests.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt) test_emscripten_external: docker: - image: trzeci/emscripten:sdk-tag-1.37.21-64bit diff --git a/scripts/test_emscripten.sh b/scripts/test_emscripten.sh index a0827138..1804f23a 100755 --- a/scripts/test_emscripten.sh +++ b/scripts/test_emscripten.sh @@ -30,8 +30,9 @@ set -e REPO_ROOT=$(cd $(dirname "$0")/.. && pwd) SOLJSON="$REPO_ROOT/build/libsolc/soljson.js" +VERSION=$("$REPO_ROOT"/scripts/get_version.sh) echo "Running solcjs tests...." -"$REPO_ROOT/test/solcjsTests.sh" "$SOLJSON" +"$REPO_ROOT/test/solcjsTests.sh" "$SOLJSON" "$VERSION" echo "Running external tests...." "$REPO_ROOT/test/externalTests.sh" "$SOLJSON" diff --git a/test/solcjsTests.sh b/test/solcjsTests.sh index b6d2a017..27797cb4 100755 --- a/test/solcjsTests.sh +++ b/test/solcjsTests.sh @@ -28,13 +28,14 @@ set -e -if [ ! -f "$1" ] +if [ ! -f "$1" -o -z "$2" ] then - echo "Usage: $0 <path to soljson.js>" + echo "Usage: $0 <path to soljson.js> <version>" exit 1 fi SOLJSON="$1" +VERSION="$2" DIR=$(mktemp -d) ( @@ -53,7 +54,6 @@ DIR=$(mktemp -d) 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 |