1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
Date: Sun, 16 Oct 2022 19:25:28 +0200
Subject: Increase default timeouts for linter tests
---
ament_cmake_clang_tidy/cmake/ament_clang_tidy.cmake | 4 ++--
ament_cmake_copyright/cmake/ament_copyright.cmake | 4 ++--
ament_cmake_cppcheck/cmake/ament_cppcheck.cmake | 2 +-
ament_cmake_cpplint/cmake/ament_cpplint.cmake | 10 ++--------
ament_cmake_pclint/cmake/ament_pclint.cmake | 2 +-
5 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/ament_cmake_clang_tidy/cmake/ament_clang_tidy.cmake b/ament_cmake_clang_tidy/cmake/ament_clang_tidy.cmake
index 95df6ab..c3abf64 100644
--- a/ament_cmake_clang_tidy/cmake/ament_clang_tidy.cmake
+++ b/ament_cmake_clang_tidy/cmake/ament_clang_tidy.cmake
@@ -29,7 +29,7 @@
# :type CONFIG_FILE: string
# :param ARGN: the files or directories to check
# :type ARGN: list of strings
-# :param TIMEOUT: the test timeout in seconds, default: 300
+# :param TIMEOUT: the test timeout in seconds, default: 600
# :type TIMEOUT: integer
#
# @public
@@ -68,7 +68,7 @@ function(ament_clang_tidy)
endif()
if(NOT ARG_TIMEOUT)
- set(ARG_TIMEOUT 300)
+ set(ARG_TIMEOUT 600)
endif()
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/ament_clang_tidy")
diff --git a/ament_cmake_copyright/cmake/ament_copyright.cmake b/ament_cmake_copyright/cmake/ament_copyright.cmake
index 94dd190..1bbc571 100644
--- a/ament_cmake_copyright/cmake/ament_copyright.cmake
+++ b/ament_cmake_copyright/cmake/ament_copyright.cmake
@@ -17,7 +17,7 @@
#
# :param TESTNAME: the name of the test, default: "copyright"
# :type TESTNAME: string
-# :param TIMEOUT: the test timeout in seconds, default: 120
+# :param TIMEOUT: the test timeout in seconds, default: 600
# :type TIMEOUT: integer
# :param EXCLUDE: an optional list of exclude files or directories for copyright check
# :type EXCLUDE: list
@@ -32,7 +32,7 @@ function(ament_copyright)
set(ARG_TESTNAME "copyright")
endif()
if(NOT ARG_TIMEOUT)
- set(ARG_TIMEOUT 200)
+ set(ARG_TIMEOUT 600)
endif()
find_program(ament_copyright_BIN NAMES "ament_copyright")
diff --git a/ament_cmake_cppcheck/cmake/ament_cppcheck.cmake b/ament_cmake_cppcheck/cmake/ament_cppcheck.cmake
index cc66f41..0f2fa8a 100644
--- a/ament_cmake_cppcheck/cmake/ament_cppcheck.cmake
+++ b/ament_cmake_cppcheck/cmake/ament_cppcheck.cmake
@@ -66,7 +66,7 @@ function(ament_cppcheck)
ament_add_test(
"${ARG_TESTNAME}"
COMMAND ${cmd}
- TIMEOUT 300
+ TIMEOUT 600
OUTPUT_FILE "${CMAKE_BINARY_DIR}/ament_cppcheck/${ARG_TESTNAME}.txt"
RESULT_FILE "${result_file}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
diff --git a/ament_cmake_cpplint/cmake/ament_cpplint.cmake b/ament_cmake_cpplint/cmake/ament_cpplint.cmake
index 4398450..e2c9f5b 100644
--- a/ament_cmake_cpplint/cmake/ament_cpplint.cmake
+++ b/ament_cmake_cpplint/cmake/ament_cpplint.cmake
@@ -24,7 +24,7 @@
# :type MAX_LINE_LENGTH: integer
# :param ROOT: override the --root option of cpplint
# :type ROOT: string
-# :param TIMEOUT: the test timeout in seconds, default: 120
+# :param TIMEOUT: the test timeout in seconds, default: 600
# :type TIMEOUT: integer
# :param EXCLUDE: an optional list of exclude directories or files for cpplint
# :type EXCLUDE: list
@@ -61,13 +61,7 @@ function(ament_cpplint)
endif()
list(APPEND cmd ${ARG_UNPARSED_ARGUMENTS})
if(NOT ARG_TIMEOUT)
- if(WIN32)
- # There are many timeouts when cpplint is executed on Windows,
- # increasing the timeout seems to fix the problem.
- set(ARG_TIMEOUT 500)
- else()
- set(ARG_TIMEOUT 120)
- endif()
+ set(ARG_TIMEOUT 600)
endif()
if(NOT ARG_TIMEOUT GREATER 0)
message(FATAL_ERROR "ament_add_test() the TIMEOUT argument must be a "
diff --git a/ament_cmake_pclint/cmake/ament_pclint.cmake b/ament_cmake_pclint/cmake/ament_pclint.cmake
index bdac4a4..927e18a 100644
--- a/ament_cmake_pclint/cmake/ament_pclint.cmake
+++ b/ament_cmake_pclint/cmake/ament_pclint.cmake
@@ -107,7 +107,7 @@ function(ament_pclint)
OUTPUT_FILE "${CMAKE_BINARY_DIR}/ament_pclint/${ARG_TESTNAME}.txt"
RESULT_FILE "${result_file}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
- TIMEOUT 120)
+ TIMEOUT 600)
set_tests_properties(
"${ARG_TESTNAME}"
PROPERTIES
|
