From 3ad935d355bde8fb5c2127a6923c70dfefe31839 Mon Sep 17 00:00:00 2001 From: Mayank <33252549+mynktl@users.noreply.github.com> Date: Thu, 22 Nov 2018 13:33:35 +0530 Subject: [PATCH] fix(build): travis build for non-debug builds (#155) Signed-off-by: mayank --- .travis.yml | 2 +- tests/cbtest/gtest/test_uzfs.cc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a31a978e9341..151ad255aa9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,6 +73,7 @@ script: export FIO_SRCDIR=$PWD/../fio; sudo bash ./print_debug_info.sh & sudo bash ./tests/cbtest/script/test_uzfs.sh -T all || travis_terminate 1; + ./build_image.sh || travis_terminate 1; else sudo /sbin/modprobe zfs; travis_wait 10 /sbin/ztest || travis_terminate 1; @@ -80,6 +81,5 @@ script: after_failure: - find /var/tmp/test_results/current/log -type f -name '*' -printf "%f\n" -exec cut -c -$ZFS_TEST_TRAVIS_LOG_MAX_LENGTH {} \; after_success: - - if [ $ZFS_BUILD_TAGS = 0 ]; then ./build_image.sh; fi - find /var/tmp/test_results/current/log -type f -name '*' -printf "%f\n" -exec cut -c -$ZFS_TEST_TRAVIS_LOG_MAX_LENGTH {} \; - bash <(curl -s https://codecov.io/bash) diff --git a/tests/cbtest/gtest/test_uzfs.cc b/tests/cbtest/gtest/test_uzfs.cc index 8ce2583edf86..044ecdf98dd4 100644 --- a/tests/cbtest/gtest/test_uzfs.cc +++ b/tests/cbtest/gtest/test_uzfs.cc @@ -2075,7 +2075,9 @@ TEST(uZFSRebuild, TestErroredRebuild) { zk_thread_join(writer_thread->t_tid); zvol_rebuild_step_size = ((total_ios/10) + 1) * 4096; +#ifdef DEBUG inject_error.inject_rebuild_error.dw_replica_rebuild_error_io = (total_ios) / 4; +#endif execute_rebuild_test_case("errored rebuild with data conn", 15, ZVOL_REBUILDING_SNAP, ZVOL_REBUILDING_FAILED, 4, "vol3"); close(wargs.r1_fd); @@ -2099,7 +2101,9 @@ TEST(uZFSRebuild, TestErroredRebuild) { 0, 0); zvol_rebuild_step_size = (10 * 1024ULL * 1024ULL * 1024ULL); +#ifdef DEBUG inject_error.inject_rebuild_error.dw_replica_rebuild_error_io = 0; +#endif execute_rebuild_test_case("complete rebuild with data conn", 15, ZVOL_REBUILDING_SNAP, ZVOL_REBUILDING_DONE, 6, "vol3");