aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-05-15 20:41:14 +0800
committerGitHub <noreply@github.com>2018-05-15 20:41:14 +0800
commitb8b460994ff3cb9f01c4c1c063305a8651a10bb5 (patch)
tree1d840c2ea31f1ab486ddf18e496126e6601e1f47
parent267b605fcd7e5f603ebd49ff772cc91ba4234acb (diff)
parent07fb2ad9faccfc4272059b35f16e2a604ad55058 (diff)
downloaddexon-solidity-b8b460994ff3cb9f01c4c1c063305a8651a10bb5.tar.gz
dexon-solidity-b8b460994ff3cb9f01c4c1c063305a8651a10bb5.tar.zst
dexon-solidity-b8b460994ff3cb9f01c4c1c063305a8651a10bb5.zip
Merge pull request #3953 from ethereum/noemscriptentestsontravis
Do not run emscripten tests on travis.
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 3640d2e2..8487deef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -173,7 +173,7 @@ before_script:
&& scripts/create_source_tarball.sh)
script:
- - test $SOLC_EMSCRIPTEN != On || (scripts/test_emscripten.sh)
+ - test $SOLC_EMSCRIPTEN != On -o $SOLC_TESTS != On || (scripts/test_emscripten.sh)
- test $SOLC_TESTS != On || (cd $TRAVIS_BUILD_DIR && scripts/tests.sh)
- test $SOLC_STOREBYTECODE != On || (cd $TRAVIS_BUILD_DIR && scripts/bytecodecompare/storebytecode.sh)