merge from master branch

omni · Feb 15, 2018 · ca64cf3 · ca64cf3
2 parents 199e7ec + 3961987
commit ca64cf3
Show file tree

Hide file tree

Showing 39 changed files with 3,139 additions and 1,545 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,3 +54,5 @@ examples/db.toml
 jsTests/package-lock.json
 node_modules
 compiled_contracts
+
+integration-tests/tmp
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,13 @@ matrix:
         - sudo add-apt-repository ppa:ethereum/ethereum -y
         - sudo apt-get update -y
         - sudo apt-get install solc -y
+        - wget https://parity-downloads-mirror.parity.io/v1.8.6/x86_64-unknown-linux-gnu/parity
+        - chmod +x parity
+        - cp parity ${HOME}/bin
+        - export PATH=${HOME}/bin:${PATH}
+        - cd integration-tests
       script:
-        - cargo test --all
+        - env BACKTRACE=1 cargo test --all -- --nocapture
     - language: rust
       rust: beta
       cache: cargo
@@ -23,8 +28,13 @@ matrix:
         - sudo add-apt-repository ppa:ethereum/ethereum -y
         - sudo apt-get update -y
         - sudo apt-get install solc -y
+        - wget https://parity-downloads-mirror.parity.io/v1.8.6/x86_64-unknown-linux-gnu/parity
+        - chmod +x parity
+        - cp parity ${HOME}/bin
+        - export PATH=${HOME}/bin:${PATH}
+        - cd integration-tests
       script:
-        - cargo test --all
+        - env BACKTRACE=1 cargo test --all -- --nocapture
     - language: rust
       rust: nightly
       cache: cargo
@@ -33,8 +43,13 @@ matrix:
         - sudo add-apt-repository ppa:ethereum/ethereum -y
         - sudo apt-get update -y
         - sudo apt-get install solc -y
+        - wget https://parity-downloads-mirror.parity.io/v1.8.6/x86_64-unknown-linux-gnu/parity
+        - chmod +x parity
+        - cp parity ${HOME}/bin
+        - export PATH=${HOME}/bin:${PATH}
+        - cd integration-tests
       script:
-        - cargo test --all
+        - env BACKTRACE=1 cargo test --all -- --nocapture
     - language: node_js
       node_js: node
       cache: yarn