diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/CMakeLists.txt b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/CMakeLists.txt index f0d6876a213479d30761ccd5127ebde3a375a06c..8e8f0d119525929e68d0d30e38eb25d7881c0a73 100644 --- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/CMakeLists.txt +++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( TrkVertexSeedFinderTools ) @@ -22,31 +22,13 @@ atlas_add_component( TrkVertexSeedFinderTools GeoPrimitives StoreGateLib TestTools TrkEventPrimitives TrkParameters TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderToolsLib TrkVertexSeedFinderUtilsLib TruthHelper ) - # Install files from the package: atlas_install_joboptions( share/*.py ) # Tests in the package: function( run_seed_test testName ) - cmake_parse_arguments( ARG "" "COMMAND;ARG" "" ${ARGN} ) - - if( ARG_COMMAND ) - set( _command ${ARG_COMMAND} ) - else() - set( _command athena.py ) - endif() - - if( ARG_ARG ) - set( _arg ${ARG_ARG} ) - else() - set( _arg TrkVertexSeedFinderTools/${testName}_test.py ) - endif() - - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/test/seed_test.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/seed_${testName}.sh - @ONLY ) atlas_add_test( ${testName} - SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/seed_${testName}.sh + SCRIPT athena.py TrkVertexSeedFinderTools/${testName}_test.py PROPERTIES TIMEOUT 300 LOG_IGNORE_PATTERN " INFO |WARNING |found service|Adding private|^ +[+]|HepPDT Version|class DataHeader|class PoolToken" ) endfunction (run_seed_test) diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/test/seed_test.sh.in b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/test/seed_test.sh.in deleted file mode 100755 index 4691ed15a702c2f7a2bbcfbd620f01333911e62d..0000000000000000000000000000000000000000 --- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/test/seed_test.sh.in +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -set -e - -@_command@ @_arg@