Handle version for solcjs tests.

circle.yml

@@ -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

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"

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