1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00

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.
This commit is contained in:
Zdenek Kabelac 2015-10-26 11:04:58 +01:00
parent ba41ee1dc9
commit c301cc5d38
2 changed files with 7 additions and 4 deletions

2
aclocal.m4 vendored
View File

@ -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 -*- # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24) # 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 # 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 # it under the terms of the GNU General Public License as published by

View File

@ -17,7 +17,7 @@
*/ */
/* /*
* (c) 2014 Petr Ročkai <me@mornfall.net> * (c) 2014 Petr Rockai <me@mornfall.net>
* (c) 2014 Red Hat, Inc. * (c) 2014 Red Hat, Inc.
*/ */
@ -81,6 +81,9 @@
#include "configure.h" #include "configure.h"
/* Timeout for the whole test suite in hours */
static const unsigned TEST_SUITE_TIMEOUT = 4;
#ifndef BRICK_SHELLTEST_H #ifndef BRICK_SHELLTEST_H
#define BRICK_SHELLTEST_H #define BRICK_SHELLTEST_H
@ -1034,8 +1037,8 @@ struct Main {
die = 1; die = 1;
} }
if ( time(0) - start > 3 * 3600 ) { if ( time(0) - start > (TEST_SUITE_TIMEOUT * 3600) ) {
std::cerr << "3 hours passed, giving up..." << std::endl; std::cerr << TEST_SUITE_TIMEOUT << " hours passed, giving up..." << std::endl;
die = 1; die = 1;
} }