From: Loic Dachary <loic@dachary.org>
Date: Wed, 10 Jun 2015 05:45:17 +0000 (+0200)
Subject: Merge pull request #54 from dachary/wip-hammer-timeout
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b846f94b3ab80189b6ce95f3ad2ea79014f37669;p=autobuild-ceph.git

Merge pull request #54 from dachary/wip-hammer-timeout

make check times out after 1h30 instead of 1h00

Reviewed-by: Nathan Cutler <ncutler@suse.com>
---

b846f94b3ab80189b6ce95f3ad2ea79014f37669
diff --cc build-ceph.sh
index 7f121ea,0ead50c..2b77255
--- a/build-ceph.sh
+++ b/build-ceph.sh
@@@ -88,9 -88,9 +88,9 @@@ make -j$(get_processors) "$@" || exit 
  
  # run "make check", but give it a time limit in case a test gets stuck
  
 -trap "pkill -9 ceph-osd ; pkill -9 ceph-mon" EXIT
 +trap "pkill -9 ceph-osd || true ; pkill -9 ceph-mon || true" EXIT
  
- if ! ../maxtime 3600 make $(maybe_parallel_make_check) check "$@" ; then
+ if ! ../maxtime 5400 make $(maybe_parallel_make_check) check "$@" ; then
      display_failures .
      exit 5
  fi