Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Project_Phoenix
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LuFG VR VIS
VR-Group
Project_Phoenix
Commits
3a313ba5
Commit
3a313ba5
authored
Sep 29, 2017
by
Thomas Vierjahn
Browse files
Options
Downloads
Patches
Plain Diff
Change default test timeout to 7s due to CI timeout on windows.
#139
parent
5e43ad49
Branches
Branches containing commit
No related tags found
2 merge requests
!50
Release v17.10.0
,
!38
Feature/08 model loading
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake/Testing.cmake
+1
-1
1 addition, 1 deletion
cmake/Testing.cmake
cmake/cpplint.cmake
+1
-1
1 addition, 1 deletion
cmake/cpplint.cmake
tests/CMakeLists.txt
+1
-1
1 addition, 1 deletion
tests/CMakeLists.txt
with
3 additions
and
3 deletions
cmake/Testing.cmake
+
1
−
1
View file @
3a313ba5
...
@@ -53,7 +53,7 @@ function(ADD_TEST_CATCH_INTERNAL_
...
@@ -53,7 +53,7 @@ function(ADD_TEST_CATCH_INTERNAL_
endif
()
endif
()
add_test
(
NAME
${
NAME
}
COMMAND
${
NAME
}
)
add_test
(
NAME
${
NAME
}
COMMAND
${
NAME
}
)
set_tests_properties
(
${
NAME
}
PROPERTIES TIMEOUT
5
.0
)
set_tests_properties
(
${
NAME
}
PROPERTIES TIMEOUT
7
.0
)
set_warning_levels_RWTH
(
${
NAME
}
)
set_warning_levels_RWTH
(
${
NAME
}
)
set_property
(
TARGET
${
NAME
}
PROPERTY FOLDER
"Tests"
)
set_property
(
TARGET
${
NAME
}
PROPERTY FOLDER
"Tests"
)
...
...
This diff is collapsed.
Click to expand it.
cmake/cpplint.cmake
+
1
−
1
View file @
3a313ba5
...
@@ -71,5 +71,5 @@ function(ADD_TEST_CPPLINT)
...
@@ -71,5 +71,5 @@ function(ADD_TEST_CPPLINT)
COMMAND
${
PYTHON_EXECUTABLE
}
${
CPPLINT_COMMAND
}
${
CPPLINT_OUTPUT
}
COMMAND
${
PYTHON_EXECUTABLE
}
${
CPPLINT_COMMAND
}
${
CPPLINT_OUTPUT
}
${
ADD_TEST_CPPLINT_UNPARSED_ARGUMENTS
}
${
ADD_TEST_CPPLINT_UNPARSED_ARGUMENTS
}
)
)
set_tests_properties
(
${
ADD_TEST_CPPLINT_NAME
}
PROPERTIES TIMEOUT
5
.0
)
set_tests_properties
(
${
ADD_TEST_CPPLINT_NAME
}
PROPERTIES TIMEOUT
7
.0
)
endfunction
()
endfunction
()
This diff is collapsed.
Click to expand it.
tests/CMakeLists.txt
+
1
−
1
View file @
3a313ba5
...
@@ -84,7 +84,7 @@ macro(add_mocked_test cpp_file mock_SDL mock_glew is_Integration_Test)
...
@@ -84,7 +84,7 @@ macro(add_mocked_test cpp_file mock_SDL mock_glew is_Integration_Test)
add_test
(
NAME
${
cpp_file
}
add_test
(
NAME
${
cpp_file
}
COMMAND
${
cpp_file
}
COMMAND
${
cpp_file
}
)
)
set_tests_properties
(
${
cpp_file
}
PROPERTIES TIMEOUT
5
.0
)
set_tests_properties
(
${
cpp_file
}
PROPERTIES TIMEOUT
7
.0
)
else
()
else
()
set_property
(
TARGET
${
cpp_file
}
PROPERTY FOLDER
"Integration_Tests"
)
set_property
(
TARGET
${
cpp_file
}
PROPERTY FOLDER
"Integration_Tests"
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment