From 59838d872ce6d7e06e8ce56a2649d95a87f817bb Mon Sep 17 00:00:00 2001 From: William Buttinger <will.buttinger@cern.ch> Date: Wed, 17 Jul 2024 10:18:45 +0200 Subject: [PATCH 1/2] Update CMakeLists.txt - check AtlasProject environment variable when deciding if to enable tests --- AtlasTest/CITest/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AtlasTest/CITest/CMakeLists.txt b/AtlasTest/CITest/CMakeLists.txt index 3983a1dadf33..838a07198078 100644 --- a/AtlasTest/CITest/CMakeLists.txt +++ b/AtlasTest/CITest/CMakeLists.txt @@ -21,7 +21,7 @@ foreach( project Athena AnalysisBase AthGeneration AthSimulation ) # Detect project name for full and WorkDir builds: # - ATLAS_PROJECT: set to parent project in WorkDir # - CMAKE_PROJECT_NAME: project name in full builds - if( ATLAS_PROJECT STREQUAL ${project} OR CMAKE_PROJECT_NAME STREQUAL ${project} ) + if( ATLAS_PROJECT STREQUAL ${project} OR CMAKE_PROJECT_NAME STREQUAL ${project} OR $ENV{AtlasProject} STREQUAL ${project} ) message( STATUS "Enabling CI tests for project ${project}" ) include( ${project}.cmake ) endif() -- GitLab From 06b624134c10bc03bdc9ab896de0896a2351005a Mon Sep 17 00:00:00 2001 From: William Buttinger <will.buttinger@cern.ch> Date: Wed, 17 Jul 2024 10:57:03 +0200 Subject: [PATCH 2/2] Update CMakeLists.txt - fix case where env not set --- AtlasTest/CITest/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AtlasTest/CITest/CMakeLists.txt b/AtlasTest/CITest/CMakeLists.txt index 838a07198078..e0a9e12a58af 100644 --- a/AtlasTest/CITest/CMakeLists.txt +++ b/AtlasTest/CITest/CMakeLists.txt @@ -21,7 +21,7 @@ foreach( project Athena AnalysisBase AthGeneration AthSimulation ) # Detect project name for full and WorkDir builds: # - ATLAS_PROJECT: set to parent project in WorkDir # - CMAKE_PROJECT_NAME: project name in full builds - if( ATLAS_PROJECT STREQUAL ${project} OR CMAKE_PROJECT_NAME STREQUAL ${project} OR $ENV{AtlasProject} STREQUAL ${project} ) + if( ATLAS_PROJECT STREQUAL ${project} OR CMAKE_PROJECT_NAME STREQUAL ${project} OR "$ENV{AtlasProject}" STREQUAL ${project} ) message( STATUS "Enabling CI tests for project ${project}" ) include( ${project}.cmake ) endif() -- GitLab