Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ADIOS2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
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
Podhorszki, Norbert
ADIOS2
Commits
a2ccdf48
Commit
a2ccdf48
authored
7 years ago
by
Wittenburg, William
Browse files
Options
Downloads
Patches
Plain Diff
Move setting of test configuration type into common
parent
4b43fc34
No related branches found
No related tags found
1 merge request
!272
CI Fixes: master build name + test configuration type
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/appveyor/av_default.cmake
+0
-1
0 additions, 1 deletion
scripts/appveyor/av_default.cmake
scripts/dashboard/common.cmake
+4
-1
4 additions, 1 deletion
scripts/dashboard/common.cmake
with
4 additions
and
2 deletions
scripts/appveyor/av_default.cmake
+
0
−
1
View file @
a2ccdf48
# Client maintainer: chuck.atkins@kitware.com
# Client maintainer: chuck.atkins@kitware.com
set
(
CTEST_SITE
"AppVeyor"
)
set
(
CTEST_SITE
"AppVeyor"
)
set
(
CTEST_BUILD_CONFIGURATION Release
)
set
(
CTEST_BUILD_CONFIGURATION Release
)
set
(
CTEST_CONFIGURATION_TYPE Release
)
set
(
CTEST_CMAKE_GENERATOR
"Visual Studio 14 2015 Win64"
)
set
(
CTEST_CMAKE_GENERATOR
"Visual Studio 14 2015 Win64"
)
set
(
CTEST_TEST_ARGS PARALLEL_LEVEL 4
)
set
(
CTEST_TEST_ARGS PARALLEL_LEVEL 4
)
...
...
This diff is collapsed.
Click to expand it.
scripts/dashboard/common.cmake
+
4
−
1
View file @
a2ccdf48
...
@@ -131,12 +131,15 @@ if(NOT "${dashboard_model}" MATCHES "^(Nightly|Experimental)$")
...
@@ -131,12 +131,15 @@ if(NOT "${dashboard_model}" MATCHES "^(Nightly|Experimental)$")
message
(
FATAL_ERROR
"dashboard_model must be Nightly or Experimental"
)
message
(
FATAL_ERROR
"dashboard_model must be Nightly or Experimental"
)
endif
()
endif
()
# Default to a Debug build.
# Default to a Debug build.
if
(
NOT DEFINED CTEST_BUILD_CONFIGURATION
)
if
(
NOT DEFINED CTEST_BUILD_CONFIGURATION
)
set
(
CTEST_BUILD_CONFIGURATION Debug
)
set
(
CTEST_BUILD_CONFIGURATION Debug
)
endif
()
endif
()
if
(
NOT DEFINED CTEST_CONFIGURATION_TYPE
)
set
(
CTEST_CONFIGURATION_TYPE
${
CTEST_BUILD_CONFIGURATION
}
)
endif
()
# Choose CTest reporting mode.
# Choose CTest reporting mode.
if
(
NOT
"
${
CTEST_CMAKE_GENERATOR
}
"
MATCHES
"Make|Ninja"
)
if
(
NOT
"
${
CTEST_CMAKE_GENERATOR
}
"
MATCHES
"Make|Ninja"
)
# Launchers work only with Makefile and Ninja generators.
# Launchers work only with Makefile and Ninja generators.
...
...
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