From 00a218be920b02f33cac67bbe5c2412018fc8f61 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 23 Jul 2018 12:57:48 +0200 Subject: [PATCH] Makefile/travis: run offline tests in CI Internet is sometimes flaky in CI. Therefore, in order to avoid unit tests from failing intermittently, don't run the cURL tests which download files from s3. --- Makefile | 3 +++ travis-docker-build.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a3ad6bf466..39c0d33f5d 100644 --- a/Makefile +++ b/Makefile @@ -136,6 +136,9 @@ run_all_tests: default run_unit_tests: default build/default/unit_tests_runner +run_unit_tests_offline: default + build/default/unit_tests_runner --gtest_filter="-CurlTest.*" + run_integration_tests: default build/default/integration_tests/integration_tests_runner diff --git a/travis-docker-build.sh b/travis-docker-build.sh index c0a9f6bdbf..d100de77b3 100755 --- a/travis-docker-build.sh +++ b/travis-docker-build.sh @@ -2,7 +2,7 @@ set -e -make BUILD_TYPE=Debug run_unit_tests -j4 +make BUILD_TYPE=Debug run_unit_tests_offline -j4 make default install make fix_style (cd example/takeoff_land && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug .. && make) @@ -11,7 +11,7 @@ make fix_style make clean git clean -dfx -make BUILD_TYPE=Release run_unit_tests -j4 +make BUILD_TYPE=Release run_unit_tests_offline -j4 make default install make fix_style (cd example/takeoff_land && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make)