From bd8b9a0e5aa4443bfcc251e665e2038dfa0804ca Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Mon, 18 Feb 2019 13:55:59 +0100
Subject: [PATCH] Fix unit test
---
Control/AthenaConfiguration/CMakeLists.txt | 2 +-
Control/AthenaConfiguration/test/test_gen_bootstrap.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Control/AthenaConfiguration/CMakeLists.txt b/Control/AthenaConfiguration/CMakeLists.txt
index cc4d51aa02e..3ce9208d39b 100644
--- a/Control/AthenaConfiguration/CMakeLists.txt
+++ b/Control/AthenaConfiguration/CMakeLists.txt
@@ -30,7 +30,7 @@ atlas_add_test( AthConfigFlagsTest
atlas_add_test( GenerateBootstrapTest
SCRIPT test/test_gen_bootstrap.sh
#ignore location of bootstrap file and whether it was already downloaded
- EXTRA_PATTERNS ".*\/share\/bootstrap*pkl|File.*exists in the current directory"
+ EXTRA_PATTERNS ".*copy bootstrap.*pkl|.*\/share\/bootstrap.*pkl|File.*exists in the current directory|^Willing to acquire"
)
if( NOT "${CMAKE_PROJECT_NAME}" STREQUAL "AthSimulation" )
diff --git a/Control/AthenaConfiguration/test/test_gen_bootstrap.sh b/Control/AthenaConfiguration/test/test_gen_bootstrap.sh
index 9a1e5e985a9..91b44912873 100755
--- a/Control/AthenaConfiguration/test/test_gen_bootstrap.sh
+++ b/Control/AthenaConfiguration/test/test_gen_bootstrap.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#Generate threaded and serial bootstrap pickles and diff them
#If there's a major change in AthenaCommon or Gaudi it will get picked up here
-
+rm bootstrap*pkl
athena --config-only=bootstrap_test.pkl AthenaConfiguration/zeroJO.py &> /dev/null
get_files -remove -data bootstrap.pkl
confTool.py --diff bootstrap.pkl bootstrap_test.pkl | grep -v identical
--
GitLab