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>

diff --cc build-ceph.sh
index 7f121eaf3cd18dcd121458a7ddd7c72b5b08447d,0ead50c9c5ddf9a16746b354446e7435b4547b7a..2b77255993b59d2fcb3cc3f0c900461d0a750a30
--- 1/build-ceph.sh
--- 2/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