From 170824fddf9a200940b355d316598661bdca4742 Mon Sep 17 00:00:00 2001
From: Tamara Vazquez Schroeder <tvazquez@cern.ch>
Date: Sat, 16 Dec 2017 12:21:58 +0100
Subject: [PATCH] putting back trigger test and not using LCG_87
Former-commit-id: d859ee82c3e48773ae061452d43eff2cc97e38e0
---
Build/AtlasBuildScripts/build_atlasexternals.sh | 2 +-
Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Build/AtlasBuildScripts/build_atlasexternals.sh b/Build/AtlasBuildScripts/build_atlasexternals.sh
index a87a86b6cd4..1b0256cdda6 100755
--- a/Build/AtlasBuildScripts/build_atlasexternals.sh
+++ b/Build/AtlasBuildScripts/build_atlasexternals.sh
@@ -86,7 +86,7 @@ fi
error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
{
cmake -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} -DCTEST_USE_LAUNCHERS:BOOL=TRUE \
- -DLCG_VERSION_NUMBER:STRING=87 ${EXTRACONF} \
+ ${EXTRACONF} \
${SOURCEDIR}/Projects/${PROJECT}/ || touch $error_stamp
} 2>&1 | tee cmake_config.log
test -f $error_stamp && ((ERROR_COUNT++))
diff --git a/Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt
index 0b37b2de683..9134646a8bf 100644
--- a/Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TriggerMenu/CMakeLists.txt
@@ -20,6 +20,11 @@ atlas_add_test( generateMenu SCRIPT scripts/testMenu.sh
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
POST_EXEC_SCRIPT "check_log.pl --config checklogTriggerTest.conf checkL1Menu.log"
)
--
GitLab