Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pugs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
code
pugs
Commits
f382992a
Commit
f382992a
authored
Apr 30, 2019
by
Stéphane Del Pino
Browse files
Options
Downloads
Patches
Plain Diff
Improve target building for CI
parent
51d2e1a0
No related branches found
No related tags found
1 merge request
!19
Feature/ci
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+0
-1
0 additions, 1 deletion
.gitlab-ci.yml
CMakeLists.txt
+8
-8
8 additions, 8 deletions
CMakeLists.txt
with
8 additions
and
9 deletions
.gitlab-ci.yml
+
0
−
1
View file @
f382992a
...
@@ -26,7 +26,6 @@ test:gcc8-seq-dbg:
...
@@ -26,7 +26,6 @@ test:gcc8-seq-dbg:
script
:
script
:
-
cd build/gcc8-dbg
-
cd build/gcc8-dbg
-
make run_unit_tests
-
make run_unit_tests
-
make coverage
cache
:
cache
:
key
:
"
${CI_COMMIT_REF_SLUG}-gcc8-dbg"
key
:
"
${CI_COMMIT_REF_SLUG}-gcc8-dbg"
paths
:
paths
:
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
8
−
8
View file @
f382992a
...
@@ -219,6 +219,13 @@ add_subdirectory("${CATCH_MODULE_PATH}")
...
@@ -219,6 +219,13 @@ add_subdirectory("${CATCH_MODULE_PATH}")
add_subdirectory
(
tests
)
add_subdirectory
(
tests
)
enable_testing
()
enable_testing
()
add_custom_target
(
run_unit_tests
ALL
COMMAND
${
CMAKE_CTEST_COMMAND
}
-j
${
PROCESSOR_COUNT
}
DEPENDS unit_tests mpi_unit_tests
COMMENT
"Executing unit tests."
)
# unit tests coverage
# unit tests coverage
if
(
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
"Coverage"
)
if
(
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
"Coverage"
)
...
@@ -244,17 +251,10 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Coverage")
...
@@ -244,17 +251,10 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Coverage")
set
(
GCOVR_OPTIONS --object-directory=
"
${
PUGS_BINARY_DIR
}
"
-r
"
${
PUGS_SOURCE_DIR
}
/src"
${
GCOVR_EXCLUDE
}
${
GCOVR_EXTRA
}
)
set
(
GCOVR_OPTIONS --object-directory=
"
${
PUGS_BINARY_DIR
}
"
-r
"
${
PUGS_SOURCE_DIR
}
/src"
${
GCOVR_EXCLUDE
}
${
GCOVR_EXTRA
}
)
add_custom_target
(
run_unit_tests
ALL
COMMAND
${
CMAKE_CTEST_COMMAND
}
-j
${
PROCESSOR_COUNT
}
DEPENDS unit_tests mpi_unit_tests pugs
COMMENT
"Executing unit tests."
)
add_custom_target
(
coverage
add_custom_target
(
coverage
ALL
ALL
COMMAND
${
GCOVR
}
${
GCOVR_OPTIONS
}
--exclude-unreachable-branches --sort-percentage
COMMAND
${
GCOVR
}
${
GCOVR_OPTIONS
}
--exclude-unreachable-branches --sort-percentage
DEPENDS run_unit_tests
DEPENDS run_unit_tests
pugs
COMMENT
"Running gcovr to build coverage report."
COMMENT
"Running gcovr to build coverage report."
)
)
...
...
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