Commit 1b53adc0 authored by Marco Clemencic's avatar Marco Clemencic Committed by Charles Leggett
Browse files

Fix tests in special configurations

parent 33578265
......@@ -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
......
......@@ -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)
......
......@@ -6,6 +6,6 @@
<text>../../options/CFplusViewBug.py</text>
</set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="timeout"><integer>120</integer></argument>
<argument name="timeout"><integer>600</integer></argument>
<argument name="reference"><text>refs/CFplusViewBug.ref</text></argument>
</extension>
......@@ -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)
......
......@@ -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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment