summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcostan <costan@google.com>2019-03-04 18:27:03 -0800
committerVictor Costan <pwnall@chromium.org>2019-03-04 18:30:09 -0800
commit808e59ec6a160244960cda64b393968ffbdae72c (patch)
tree7668f8ae3f628154ad8b966493fcfacb470b4a60
parentc69d33b0ec3dad2a8063ad66da9d51a1d6309f4e (diff)
downloadleveldb-808e59ec6a160244960cda64b393968ffbdae72c.tar.gz
Improve CI configuration.
This CL fixes the following issues: * The Travis CI had the ctest invocation followed by a ";", so non-zero exit codes (indicating test failures) did not cause the build to fail. * The AppVeyor CI had the ctest invocation followed by a ";", causing an error on Windows, where "&" plays the role of ";" [1]. The Windows CI (AppVeyor) will still be red after this CL, as some of the tests are failing. However, this CL is a step forward, as it gets us from failing to start tests to running tests and recording success/error states. [1] https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-xp/bb490954(v=technet.10)#using-multiple-commands-and-conditional-processing-symbols ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=236765633
-rw-r--r--.appveyor.yml5
-rw-r--r--.travis.yml2
2 files changed, 2 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 78aeaf1..c24b17e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -20,9 +20,6 @@ configuration:
- RelWithDebInfo
- Debug
-build:
- verbosity: minimal
-
build_script:
- git submodule update --init --recursive
- mkdir build
@@ -35,4 +32,4 @@ build_script:
- cd ..
test_script:
- - cd build ; ctest --verbose ; cd ..
+ - cd build && ctest --verbose --build-config "%CONFIGURATION%" && cd ..
diff --git a/.travis.yml b/.travis.yml
index 3ff5cfc..0e1ad6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,7 +70,7 @@ before_script:
- cd ..
script:
-- cd build ; ctest --verbose ; cd ..
+- cd build && ctest --verbose && cd ..
- "if [ -f build/db_bench ] ; then build/db_bench ; fi"
- "if [ -f build/db_bench_sqlite3 ] ; then build/db_bench_sqlite3 ; fi"
- "if [ -f build/db_bench_tree_db ] ; then build/db_bench_tree_db ; fi"