Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
Sarah Louise Williams
athena
Commits
170824fd
Commit
170824fd
authored
7 years ago
by
Tamara Vazquez Schroeder
Browse files
Options
Downloads
Patches
Plain Diff
putting back trigger test and not using LCG_87
Former-commit-id: d859ee82c3e48773ae061452d43eff2cc97e38e0
parent
3b683bce
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Build/AtlasBuildScripts/build_atlasexternals.sh
+1
-1
1 addition, 1 deletion
Build/AtlasBuildScripts/build_atlasexternals.sh
Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt
+5
-0
5 additions, 0 deletions
Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt
with
6 additions
and
1 deletion
Build/AtlasBuildScripts/build_atlasexternals.sh
+
1
−
1
View file @
170824fd
...
@@ -86,7 +86,7 @@ fi
...
@@ -86,7 +86,7 @@ fi
error_stamp
=
`
mktemp
.tmp.error.XXXXX
`
;
rm
-f
$error_stamp
error_stamp
=
`
mktemp
.tmp.error.XXXXX
`
;
rm
-f
$error_stamp
{
{
cmake
-DCMAKE_BUILD_TYPE
:STRING
=
${
BUILDTYPE
}
-DCTEST_USE_LAUNCHERS
:BOOL
=
TRUE
\
cmake
-DCMAKE_BUILD_TYPE
:STRING
=
${
BUILDTYPE
}
-DCTEST_USE_LAUNCHERS
:BOOL
=
TRUE
\
-DLCG_VERSION_NUMBER
:STRING
=
87
${
EXTRACONF
}
\
${
EXTRACONF
}
\
${
SOURCEDIR
}
/Projects/
${
PROJECT
}
/
||
touch
$error_stamp
${
SOURCEDIR
}
/Projects/
${
PROJECT
}
/
||
touch
$error_stamp
}
2>&1 |
tee
cmake_config.log
}
2>&1 |
tee
cmake_config.log
test
-f
$error_stamp
&&
((
ERROR_COUNT++
))
test
-f
$error_stamp
&&
((
ERROR_COUNT++
))
...
...
This diff is collapsed.
Click to expand it.
Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt
+
5
−
0
View file @
170824fd
...
@@ -20,6 +20,11 @@ atlas_add_test( generateMenu SCRIPT scripts/testMenu.sh
...
@@ -20,6 +20,11 @@ atlas_add_test( generateMenu SCRIPT scripts/testMenu.sh
POST_EXEC_SCRIPT
"check_log.pl --config checklogTriggerTest.conf generateMenu.log"
POST_EXEC_SCRIPT
"check_log.pl --config checklogTriggerTest.conf generateMenu.log"
)
)
atlas_add_test
(
pyflakesMenu
SCRIPT scripts/pyflakesMenu.sh
ENVIRONMENT
"PYPATH=
${
CMAKE_CURRENT_SOURCE_DIR
}
/python
${
CMAKE_CURRENT_SOURCE_DIR
}
/share
${
CMAKE_CURRENT_SOURCE_DIR
}
/scripts"
)
atlas_add_test
(
checkL1Menu SCRIPT scripts/checkL1Menu.sh
atlas_add_test
(
checkL1Menu SCRIPT scripts/checkL1Menu.sh
POST_EXEC_SCRIPT
"check_log.pl --config checklogTriggerTest.conf checkL1Menu.log"
POST_EXEC_SCRIPT
"check_log.pl --config checklogTriggerTest.conf checkL1Menu.log"
)
)
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