Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yuhao Liu
ogs
Commits
93a0a1e2
Verified
Commit
93a0a1e2
authored
3 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[ci] Use ctest labels.
parent
989a41ea
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/ci/extends/template-build-linux.yml
+4
-4
4 additions, 4 deletions
scripts/ci/extends/template-build-linux.yml
scripts/ci/extends/template-build-win.yml
+2
-2
2 additions, 2 deletions
scripts/ci/extends/template-build-win.yml
with
6 additions
and
6 deletions
scripts/ci/extends/template-build-linux.yml
+
4
−
4
View file @
93a0a1e2
...
@@ -24,18 +24,18 @@
...
@@ -24,18 +24,18 @@
if [ "$BUILD_TESTS" = true ] ; then $BUILD_CMD_PREFIX cmake --build . --target tests ; fi
if [ "$BUILD_TESTS" = true ] ; then $BUILD_CMD_PREFIX cmake --build . --target tests ; fi
if [ "$BUILD_CTEST" = true ]; then
if [ "$BUILD_CTEST" = true ]; then
ctest_labels="default"
if [ "$BUILD_CTEST_LARGE" = true ] ; then ctest_labels="large|$ctest_labels" ; fi
ctest_exit=0
ctest_exit=0
ctest -T Test --no-compress-output -
-exclude-regex LARGE --timeout 900
|| ctest_exit=$?
ctest -T Test --no-compress-output -
L "$ctest_labels"
|| ctest_exit=$?
if [ $ctest_exit -ne 0 ]; then
if [ $ctest_exit -ne 0 ]; then
echo "ctests failed (showing the last ${NUM_CTEST_ERROR_LINES} lines):"
echo "ctests failed (showing the last ${NUM_CTEST_ERROR_LINES} lines):"
xsltproc ${CI_PROJECT_DIR}/scripts/test/ctest-error-output.xsl Testing/*/Test.xml | tail -n ${NUM_CTEST_ERROR_LINES}
xsltproc ${CI_PROJECT_DIR}/scripts/test/ctest-error-output.xsl Testing/*/Test.xml | tail -n ${NUM_CTEST_ERROR_LINES}
exit $ctest_exit
exit $ctest_exit
fi
fi
cp Testing/**/Test.xml Tests/ctest.xml
fi
fi
if [ "$BUILD_CTEST_LARGE" = true ] ; then $BUILD_CMD_PREFIX cmake --build . --target ctest-large ; fi
if [ "$BUILD_CTEST" = true ] ; then cp Testing/**/Test.xml Tests/ctest.xml ; fi
if [ "$BUILD_CTEST_LARGE" = true ] ; then cp Testing/**/Test.xml Tests/ctest-large.xml ; fi
else
else
$BUILD_CMD_PREFIX cmake --build . --target ${TARGETS} > >(tee make.output)
$BUILD_CMD_PREFIX cmake --build . --target ${TARGETS} > >(tee make.output)
fi
fi
...
...
This diff is collapsed.
Click to expand it.
scripts/ci/extends/template-build-win.yml
+
2
−
2
View file @
93a0a1e2
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
-
|
-
|
if($env:BUILD_CTEST -eq "true")
if($env:BUILD_CTEST -eq "true")
{
{
ctest -T Test --no-compress-output -
-exclude-regex LARGE --timeout 900
ctest -T Test --no-compress-output -
LE large
$ctest_exit=$?
$ctest_exit=$?
if(!$ctest_exit)
if(!$ctest_exit)
{
{
...
@@ -35,8 +35,8 @@
...
@@ -35,8 +35,8 @@
Get-Content -Path ./ctest-error-ouput.txt -Tail $env:NUM_CTEST_ERROR_LINES
Get-Content -Path ./ctest-error-ouput.txt -Tail $env:NUM_CTEST_ERROR_LINES
exit $ctest_exit
exit $ctest_exit
}
}
cp Testing/**/Test.xml Tests/ctest.xml
}
}
-
if($env:BUILD_CTEST -eq "true") { cp Testing/**/Test.xml Tests/ctest.xml }
-
|
-
|
if($env:CHECK_WARNINGS -eq "true" -and (cat make.output | Select-String -Pattern ': warning') )
if($env:CHECK_WARNINGS -eq "true" -and (cat make.output | Select-String -Pattern ': warning') )
{
{
...
...
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