From f0af4019efb35982823feaadea22198016ca0100 Mon Sep 17 00:00:00 2001
From: Boris Kostenko <limexp@mail.ru>
Date: Fri, 20 Oct 2017 00:41:56 +0300
Subject: No bytecodecompare if tests failed (issue #2300)

---
 .travis.yml  | 4 ++--
 appveyor.yml | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 708d3620..cf40a74a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -183,9 +183,9 @@ before_script:
       && scripts/create_source_tarball.sh)
 
 script:
-    - test $SOLC_EMSCRIPTEN != On || (scripts/test_emscripten.sh)
+    - test $SOLC_EMSCRIPTEN != On || (scripts/test_emscripten.sh) || SOLC_STOREBYTECODE=Off
     - test $SOLC_DOCS != On || (scripts/docs.sh)
-    - test $SOLC_TESTS != On || (cd $TRAVIS_BUILD_DIR && scripts/tests.sh)
+    - test $SOLC_TESTS != On || (cd $TRAVIS_BUILD_DIR && scripts/tests.sh) || SOLC_STOREBYTECODE=Off
     - test $SOLC_STOREBYTECODE != On || (cd $TRAVIS_BUILD_DIR && scripts/bytecodecompare/storebytecode.sh)
 
 deploy:
diff --git a/appveyor.yml b/appveyor.yml
index c63414b3..c4584228 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -68,15 +68,14 @@ build_script:
     - cd %APPVEYOR_BUILD_FOLDER%
     - scripts\release.bat %CONFIGURATION%
     - ps: $bytecodedir = git show -s --format="%cd-%H" --date=short
-# Skip bytecode compare if private key is not available
-    - ps: if ($env:priv_key) {
-        scripts\bytecodecompare\storebytecode.bat $Env:CONFIGURATION $bytecodedir
-        }
 
 test_script:
-    - cd %APPVEYOR_BUILD_FOLDER%
     - cd %APPVEYOR_BUILD_FOLDER%\build\test\%CONFIGURATION%
     - soltest.exe --show-progress -- --no-ipc --no-smt
+# Skip bytecode compare if private key is not available
+    - ps: if ($env:priv_key) {
+        scripts\bytecodecompare\storebytecode.bat $Env:CONFIGURATION $bytecodedir
+        }
 
 artifacts:
     - path: solidity-windows.zip
-- 
cgit v1.2.3