diff --git a/.travis.yml b/.travis.yml index 81245f35..e5872a31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: - OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release - OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release - OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1 - - OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=DEBUG + - OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug matrix: exclude: @@ -21,7 +21,7 @@ matrix: - compiler: clang env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release - compiler: clang - env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=DEBUG + env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug - os: linux compiler: clang env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh index c7387ab2..bec41d6d 100755 --- a/tools/travis-ci/run.sh +++ b/tools/travis-ci/run.sh @@ -189,20 +189,26 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then done < failures.txt fi fi - - # 4th memcheck step - OPJ_MEMCHECK_XML=$(find build -path 'build/Testing/*' -name 'DynamicAnalysis.xml') - if [ -f "${OPJ_MEMCHECK_XML}" ]; then - echo "TODO parse DynamicAnalysis.xml" - fi - + if [ ${OPJ_CI_RESULT} -eq 0 ]; then - echo "No new/unknown test failure found" + echo "No new/unknown test failure found + " else echo " New/unknown test failure found!!! " fi + + # 4th memcheck step + OPJ_MEMCHECK_XML=$(find build -path 'build/Testing/*' -name 'DynamicAnalysis.xml') + if [ -f "${OPJ_MEMCHECK_XML}" ]; then + if grep ' /dev/null; then + echo "Errors were found in dynamic analysis log" + OPJ_CI_RESULT=1 + fi + fi + + fi exit ${OPJ_CI_RESULT}