diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-10-26 11:04:58 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-10-26 23:57:47 +0100 |
| commit | c301cc5d3840e1badd015164e0dcabfacc8f9599 (patch) | |
| tree | dce15a672147f95e29b925d1f43f4876bedb39b3 | |
| parent | ba41ee1dc94264f7ac8e61f8b1d56b10225b0d2f (diff) | |
| download | lvm2-c301cc5d3840e1badd015164e0dcabfacc8f9599.tar.gz | |
tests: extend timer for 4 hours
Extend max time for test suite to 4 hours.
Also replace some 'non-ascii' chars from source files
and keep them plain ascii.
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | test/lib/brick-shelltest.h | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 05e0ad530..67b2d59a0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -15,7 +15,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) # -# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. +# Copyright (c) 2004 Scott James Remnant <scott@netsplit.com>. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/lib/brick-shelltest.h b/test/lib/brick-shelltest.h index 0659d8e5f..ccb4fb44f 100644 --- a/test/lib/brick-shelltest.h +++ b/test/lib/brick-shelltest.h @@ -17,7 +17,7 @@ */ /* - * (c) 2014 Petr Ročkai <me@mornfall.net> + * (c) 2014 Petr Rockai <me@mornfall.net> * (c) 2014 Red Hat, Inc. */ @@ -81,6 +81,9 @@ #include "configure.h" +/* Timeout for the whole test suite in hours */ +static const unsigned TEST_SUITE_TIMEOUT = 4; + #ifndef BRICK_SHELLTEST_H #define BRICK_SHELLTEST_H @@ -1034,8 +1037,8 @@ struct Main { die = 1; } - if ( time(0) - start > 3 * 3600 ) { - std::cerr << "3 hours passed, giving up..." << std::endl; + if ( time(0) - start > (TEST_SUITE_TIMEOUT * 3600) ) { + std::cerr << TEST_SUITE_TIMEOUT << " hours passed, giving up..." << std::endl; die = 1; } |