From e9c15367b8839504afdc037be4b8c4a6b99a1b7f Mon Sep 17 00:00:00 2001 From: Marco Clemencic Date: Fri, 8 Jun 2018 11:46:38 +0200 Subject: [PATCH 1/5] Fix configuration of test genconf_with_custom_factory fixes a problem when xenv is taken from a virtualenv --- GaudiKernel/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/GaudiKernel/CMakeLists.txt b/GaudiKernel/CMakeLists.txt index 9408a869bc..520e61c8bb 100644 --- a/GaudiKernel/CMakeLists.txt +++ b/GaudiKernel/CMakeLists.txt @@ -125,11 +125,10 @@ if( GAUDI_BUILD_TESTS ) get_filename_component(genconf_cmd_name ${genconf_cmd} NAME) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/custom_factory_testdir) gaudi_add_test(genconf_with_custom_factory - COMMAND ${env_cmd} --xml ${env_xml} - ${genconf_cmd_name} + COMMAND ${genconf_cmd_name} -o ${CMAKE_CURRENT_BINARY_DIR}/custom_factory_testdir -p CustomFactoryTest - -i test_CustomFactory + -i test_CustomFactory WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/custom_factory_testdir) endif() @@ -166,7 +165,7 @@ gaudi_add_unit_test(test_reverse tests/src/test_reverse.cpp TYPE Boost) gaudi_add_compile_test(test_StatusCodeFail tests/src/test_StatusCode_fail.cxx - ERRORS "FAIL01;FAIL02;FAIL03;FAIL04") + ERRORS "FAIL01;FAIL02;FAIL03;FAIL04") #---Dictionaries------------------------------------------------------------ gaudi_add_dictionary(GaudiKernel dict/dictionary.h dict/dictionary.xml LINK_LIBRARIES GaudiKernel) -- GitLab From 679d89ae7db05695be69b7797cdc956e0ee29c8e Mon Sep 17 00:00:00 2001 From: Marco Clemencic Date: Mon, 18 Jun 2018 09:25:18 +0200 Subject: [PATCH 2/5] Ensure we pick up the system compiler in CMake modules tests --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e59e381f5..d35ab59dbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,8 +30,10 @@ include(${CMAKE_SOURCE_DIR}/cmake/externals.cmake) gaudi_project(Gaudi v30r2) # These tests do not really fit in a subdirectory. +get_filename_component(PYTHON_EXECUTABLE_DIR "${PYTHON_EXECUTABLE}" DIRECTORY) gaudi_add_test(cmake.CMakeModules - COMMAND nosetests ${CMAKE_SOURCE_DIR}/cmake/tests) + COMMAND nosetests ${CMAKE_SOURCE_DIR}/cmake/tests + ENVIRONMENT PATH+=${PYTHON_EXECUTABLE_DIR}:/usr/bin:/bin) gaudi_add_test(cmake.QMTDeps COMMAND nosetests --with-doctest ${CMAKE_SOURCE_DIR}/cmake/extract_qmtest_metadata.py) -- GitLab From b0dd1a64b64321330de1b4b39440d79852cfd61a Mon Sep 17 00:00:00 2001 From: Marco Clemencic Date: Sun, 17 Jun 2018 15:09:54 +0200 Subject: [PATCH 3/5] Workaround for stdout decoding issue --- GaudiPolicy/scripts/CTestXML2HTML | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GaudiPolicy/scripts/CTestXML2HTML b/GaudiPolicy/scripts/CTestXML2HTML index 3fd472839b..d65e9ced9c 100755 --- a/GaudiPolicy/scripts/CTestXML2HTML +++ b/GaudiPolicy/scripts/CTestXML2HTML @@ -63,6 +63,8 @@ def formatMeasurementText(txt, escape=False, preformat=True): ''' from xml.sax.saxutils import escape as escape_xml from codecs import encode + if hasattr(txt, 'decode'): + txt = txt.decode(errors='ignore') txt = encode(txt, 'utf-8', 'xmlcharrefreplace') if escape: txt = escape_xml(txt) -- GitLab From c46dfb86409c5c56786725bae2fb17e882792abd Mon Sep 17 00:00:00 2001 From: Marco Clemencic Date: Mon, 18 Jun 2018 17:20:52 +0200 Subject: [PATCH 4/5] Use CMake 3.11.0 (fix FindBoost warnings) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bb815aefe..a51c1f8de9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ variables: TESTS_REPORT: "test_report" before_script: - - export PATH=${LCG_contrib}/CMake/3.8.1/Linux-x86_64/bin:${LCG_contrib}/ninja/1.7.1/x86_64-slc6:${LCG_release_area}/Python/2.7.13-597a5/${BINARY_TAG}/bin:${PATH} + - export PATH=/cvmfs/lhcb.cern.ch/lib/contrib/CMake/3.11.0/Linux-x86_64/bin:${LCG_contrib}/ninja/1.7.1/x86_64-slc6:${LCG_release_area}/Python/2.7.13-597a5/${BINARY_TAG}/bin:${PATH} - export PATH=/cvmfs/lhcb.cern.ch/lib/lhcb/LBSCRIPTS/dev/InstallArea/scripts:${PATH} - export PYTHONPATH=/cvmfs/lhcb.cern.ch/lib/lhcb/LBSCRIPTS/dev/InstallArea/python:${PYTHONPATH} - export CMAKE_PREFIX_PATH=${LCG_release_area}:/cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2017/vtune_amplifier_xe -- GitLab From 0767c5f3826dc76ef48bfe9d3aebbff88fc5f18f Mon Sep 17 00:00:00 2001 From: Marco Clemencic Date: Mon, 18 Jun 2018 18:07:09 +0200 Subject: [PATCH 5/5] Increase avalanche_scheduler.view_crash_test timeout --- .../gaudihive.qms/avalanche_scheduler.qms/view_crash_test.qmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GaudiHive/tests/qmtest/gaudihive.qms/avalanche_scheduler.qms/view_crash_test.qmt b/GaudiHive/tests/qmtest/gaudihive.qms/avalanche_scheduler.qms/view_crash_test.qmt index 9d25b0bd0e..80dc4db797 100644 --- a/GaudiHive/tests/qmtest/gaudihive.qms/avalanche_scheduler.qms/view_crash_test.qmt +++ b/GaudiHive/tests/qmtest/gaudihive.qms/avalanche_scheduler.qms/view_crash_test.qmt @@ -6,6 +6,6 @@ ../../options/CFplusViewBug.py true -120 +600 refs/CFplusViewBug.ref -- GitLab