Travis-ci update

Correct case in config
Check DynamicAnalysis result
This commit is contained in:
mayeut 2015-09-14 20:09:50 +02:00
parent 6e11b55441
commit 3ea4486bed
2 changed files with 16 additions and 10 deletions

View File

@ -10,7 +10,7 @@ env:
- OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release - OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
- OPJ_CI_ARCH=i386 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_ASAN=1
- OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=DEBUG - OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug
matrix: matrix:
exclude: exclude:
@ -21,7 +21,7 @@ matrix:
- compiler: clang - compiler: clang
env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
- compiler: clang - 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 - os: linux
compiler: clang compiler: clang
env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release

View File

@ -190,19 +190,25 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
fi fi
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 if [ ${OPJ_CI_RESULT} -eq 0 ]; then
echo "No new/unknown test failure found" echo "No new/unknown test failure found
"
else else
echo " echo "
New/unknown test failure found!!! New/unknown test failure found!!!
" "
fi fi
# 4th memcheck step
OPJ_MEMCHECK_XML=$(find build -path 'build/Testing/*' -name 'DynamicAnalysis.xml')
if [ -f "${OPJ_MEMCHECK_XML}" ]; then
if grep '<Defect Type' ${OPJ_MEMCHECK_XML} 2> /dev/null; then
echo "Errors were found in dynamic analysis log"
OPJ_CI_RESULT=1
fi
fi
fi fi
exit ${OPJ_CI_RESULT} exit ${OPJ_CI_RESULT}