Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
Computing
cbmroot
Commits
cfa08b70
Commit
cfa08b70
authored
1 year ago
by
Pierre-Alain Loizeau
Browse files
Options
Downloads
Patches
Plain Diff
Remove check_media CI + input files as redundant w/ on-the-fly geo_check_mats
parent
c5766b71
No related branches found
No related tags found
1 merge request
!1362
Remove check_media CI + input files as redundant w/ on-the-fly geo_check_mats
Pipeline
#24514
passed
1 year ago
Stage: build
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
external/InstallInput.cmake
+1
-1
1 addition, 1 deletion
external/InstallInput.cmake
macro/mcbm/CMakeLists.txt
+0
-11
0 additions, 11 deletions
macro/mcbm/CMakeLists.txt
macro/run/CMakeLists.txt
+3
-14
3 additions, 14 deletions
macro/run/CMakeLists.txt
with
4 additions
and
26 deletions
external/InstallInput.cmake
+
1
−
1
View file @
cfa08b70
set
(
INPUT_VERSION
730acc5c3e6764fa72160312a516348372064611
)
set
(
INPUT_VERSION
ec989d78aca9ec58d90a242ff47f30e8141c3ff8
)
set
(
INPUT_SRC_URL
"https://git.cbm.gsi.de/CbmSoft/cbmroot_input.git"
)
set
(
INPUT_SRC_URL
"https://git.cbm.gsi.de/CbmSoft/cbmroot_input.git"
)
...
...
This diff is collapsed.
Click to expand it.
macro/mcbm/CMakeLists.txt
+
0
−
11
View file @
cfa08b70
...
@@ -8,7 +8,6 @@ GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/mcbm/mcbm_qa.C)
...
@@ -8,7 +8,6 @@ GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/mcbm/mcbm_qa.C)
#GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/mcbm/mcbm_check_materials.C)
#GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/mcbm/mcbm_check_materials.C)
Set
(
MACRO_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
)
Set
(
MACRO_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
)
GENERATE_CBM_TEST_SCRIPT
(
${
CBMROOT_SOURCE_DIR
}
/macro/geometry/check_media.C
${
MACRO_DIR
}
)
# ============================================================================
# ============================================================================
# Put the .rootrc file into the directory from which root is executed.
# Put the .rootrc file into the directory from which root is executed.
...
@@ -127,16 +126,6 @@ ForEach(setup IN LISTS cbm_setup)
...
@@ -127,16 +126,6 @@ ForEach(setup IN LISTS cbm_setup)
#Set(_FileName_Dependency data/mcbm_mc_${setup}_ok)
#Set(_FileName_Dependency data/mcbm_mc_${setup}_ok)
#Set_Tests_Properties(${testname} PROPERTIES REQUIRED_FILES ${_FileName_Dependency})
#Set_Tests_Properties(${testname} PROPERTIES REQUIRED_FILES ${_FileName_Dependency})
If
(
NOT
${
CBM_TEST_MODEL
}
MATCHES Experimental
)
Set
(
testname mcbm_check_media_
${
setup
}
)
Add_Test
(
${
testname
}
${
CBMROOT_BINARY_DIR
}
/macro/mcbm/check_media.sh \"data/
${
setup
}
_test\"
)
Set_Tests_Properties
(
${
testname
}
PROPERTIES
TIMEOUT
"60"
PASS_REGULAR_EXPRESSION
"Test Passed;All ok"
FIXTURES_REQUIRED
${
fixture_mcbm_qa_event_mc
}
)
EndIf
()
EndForEach
(
setup IN LISTS cbm_setup
)
EndForEach
(
setup IN LISTS cbm_setup
)
Install
(
FILES .rootrc mcbm_transport.C mcbm_digi.C mcbm_reco_event.C mcbm_match_check.C mcbm_hadron_analysis.C mcbm_qa.C
Install
(
FILES .rootrc mcbm_transport.C mcbm_digi.C mcbm_reco_event.C mcbm_match_check.C mcbm_hadron_analysis.C mcbm_qa.C
...
...
This diff is collapsed.
Click to expand it.
macro/run/CMakeLists.txt
+
3
−
14
View file @
cfa08b70
...
@@ -9,7 +9,6 @@ GENERATE_EXE_SCRIPT(${CBMROOT_BINARY_DIR}/bin cbmreco_offline)
...
@@ -9,7 +9,6 @@ GENERATE_EXE_SCRIPT(${CBMROOT_BINARY_DIR}/bin cbmreco_offline)
Set
(
MACRO_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
)
Set
(
MACRO_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
)
GENERATE_CBM_TEST_SCRIPT
(
${
CBMROOT_SOURCE_DIR
}
/macro/geometry/check_media.C
${
MACRO_DIR
}
)
# ============================================================================
# ============================================================================
...
@@ -100,16 +99,6 @@ foreach(setup IN LISTS cbm_setup)
...
@@ -100,16 +99,6 @@ foreach(setup IN LISTS cbm_setup)
RESOURCE_LOCK collParDb_
${
setup
}
RESOURCE_LOCK collParDb_
${
setup
}
)
)
set
(
testname run_check_media_
${
sname
}
)
add_test
(
${
testname
}
${
MACRO_DIR
}
/check_media.sh \"data/
${
sname
}
_coll\"
)
set_tests_properties
(
${
testname
}
PROPERTIES
TIMEOUT
${
timeOutTime
}
FAIL_REGULAR_EXPRESSION
"segmentation violation"
PASS_REGULAR_EXPRESSION
"Test Passed;All ok"
FIXTURES_REQUIRED fixt_tra_coll_
${
setup
}
FIXTURES_SETUP fixt_check_media_
${
setup
}
)
# --- Test run_tra_sign
# --- Test run_tra_sign
# --- Transport run with signal events, using run_tra_file.C
# --- Transport run with signal events, using run_tra_file.C
set
(
testname run_
${
sname
}
_tra_sign
)
set
(
testname run_
${
sname
}
_tra_sign
)
...
@@ -148,7 +137,7 @@ foreach(setup IN LISTS cbm_setup)
...
@@ -148,7 +137,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT
${
timeOutTime
}
TIMEOUT
${
timeOutTime
}
FAIL_REGULAR_EXPRESSION
"segmentation violation"
FAIL_REGULAR_EXPRESSION
"segmentation violation"
PASS_REGULAR_EXPRESSION
"Macro finished successfully"
PASS_REGULAR_EXPRESSION
"Macro finished successfully"
FIXTURES_REQUIRED fixt_
check_media
_
${
setup
}
FIXTURES_REQUIRED fixt_
tra_coll
_
${
setup
}
FIXTURES_SETUP fixt_digi_ev_
${
setup
}
FIXTURES_SETUP fixt_digi_ev_
${
setup
}
RESOURCE_LOCK collParDb_
${
setup
}
RESOURCE_LOCK collParDb_
${
setup
}
)
)
...
@@ -166,7 +155,7 @@ foreach(setup IN LISTS cbm_setup)
...
@@ -166,7 +155,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT
${
timeOutTime
}
TIMEOUT
${
timeOutTime
}
FAIL_REGULAR_EXPRESSION
"segmentation violation"
FAIL_REGULAR_EXPRESSION
"segmentation violation"
PASS_REGULAR_EXPRESSION
"Macro finished successfully"
PASS_REGULAR_EXPRESSION
"Macro finished successfully"
FIXTURES_REQUIRED
"fixt_
check_media
_
${
setup
}
;fixt_tra_sign_
${
setup
}
;fixt_tra_beam_
${
setup
}
"
FIXTURES_REQUIRED
"fixt_
tra_coll
_
${
setup
}
;fixt_tra_sign_
${
setup
}
;fixt_tra_beam_
${
setup
}
"
FIXTURES_SETUP fixt_digi_ts_
${
setup
}
FIXTURES_SETUP fixt_digi_ts_
${
setup
}
RESOURCE_LOCK collParDb_
${
setup
}
RESOURCE_LOCK collParDb_
${
setup
}
)
)
...
@@ -318,7 +307,7 @@ foreach(setup IN LISTS cbm_setup)
...
@@ -318,7 +307,7 @@ foreach(setup IN LISTS cbm_setup)
TIMEOUT
${
timeOutTime
}
TIMEOUT
${
timeOutTime
}
FAIL_REGULAR_EXPRESSION
"segmentation violation"
FAIL_REGULAR_EXPRESSION
"segmentation violation"
PASS_REGULAR_EXPRESSION
"Macro finished successfully"
PASS_REGULAR_EXPRESSION
"Macro finished successfully"
FIXTURES_REQUIRED
"fixt_
check_media
_
${
setup
}
;fixt_digi_ts_
${
setup
}
;fixt_reco_ts_eb_real_
${
setup
}
"
FIXTURES_REQUIRED
"fixt_
tra_coll
_
${
setup
}
;fixt_digi_ts_
${
setup
}
;fixt_reco_ts_eb_real_
${
setup
}
"
FIXTURES_SETUP fixt_qa_
${
setup
}
FIXTURES_SETUP fixt_qa_
${
setup
}
RESOURCE_LOCK collParDb_
${
setup
}
RESOURCE_LOCK collParDb_
${
setup
}
)
)
...
...
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