Merge pull request #896 from bobsummerwill/parameter_for_tests

Fixed conditionals for TravisCI
This commit is contained in:
Bob Summerwill 2016-08-15 01:12:23 -07:00 committed by GitHub
commit 868a1675a3

View File

@ -54,7 +54,6 @@ matrix:
compiler: gcc
env:
- TRAVIS_DOCS=On
- TRAVIS_INSTALL_DEPS=Off
- TRAVIS_RELEASE=Off
- TRAVIS_TESTS=Off
@ -133,17 +132,17 @@ cache:
- jsoncpp
install:
- test $TRAVIS_INSTALL_DEPS==Off || ./scripts/install_deps.sh
- test $TRAVIS_INSTALL_DEPS != On || ./scripts/install_deps.sh
before_script:
- test $TRAVIS_EMSCRIPTEN==Off || ./scripts/build_emscripten.sh
- test $TRAVIS_RELEASE==Off || (mkdir -p build
- test $TRAVIS_EMSCRIPTEN != On || ./scripts/build_emscripten.sh
- test $TRAVIS_RELEASE != On || (mkdir -p build
&& cd build
&& cmake .. -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE
&& make -j2
&& cd ..
&& ./scripts/release.sh $ZIP_SUFFIX )
script:
- test $TRAVIS_DOCS==Off || ./scripts/docs.sh
- test $TRAVIS_DOCS != On || ./scripts/docs.sh
# There are a variety of reliability issues with the Solidity unit-tests at the time of
# writing (especially on macOS), so within TravisCI we will try to run the unit-tests
@ -155,7 +154,7 @@ script:
# itself is broken from the failure messages which we are seeing.
#
# More details on known issues at https://github.com/ethereum/solidity/issues/769
- test $TRAVIS_TESTS==Off || (cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh) )
- test $TRAVIS_TESTS != On || (cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh) )
env:
global:
- ENCRYPTION_LABEL="6d4541b72666"
@ -219,4 +218,4 @@ deploy:
on:
repo: ethereum/solidity
branch: release
condition: $TRAVIS_RELEASE==On
condition: $TRAVIS_RELEASE == On