diff --git a/.travis.yml b/.travis.yml index 651a0362a..c4b86040c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,20 +15,7 @@ script: - cd ../ - ./htmlreport/test_htmlreport.py - cd htmlreport - - ./cppcheck-htmlreport --file ../gui/test/data/xmlfiles/xmlreport_v1.xml --title "xml1 test" --report-dir . --source-dir ../test/ - - ./cppcheck-htmlreport --file ../gui/test/data/xmlfiles/xmlreport_v2.xml --title "xml2 test" --report-dir . --source-dir ../test/ - - ../cppcheck ../gui/test --enable=all --inconclusive --xml-version=2 2> gui_test.xml - - xmllint --noout gui_test.xml - - ./cppcheck-htmlreport --file ./gui_test.xml --title "xml2 + inconclusive test" --report-dir . - - ../cppcheck ../gui/test --enable=all --inconclusive --verbose --xml-version=2 2> gui_test.xml - - xmllint --noout gui_test.xml - - ./cppcheck-htmlreport --file ./gui_test.xml --title "xml2 + inconclusive + verbose test" --report-dir . - - ../cppcheck --errorlist > errorlist.xml - - xmllint --noout errorlist.xml - - ./cppcheck-htmlreport --file ./errorlist.xml --title "errorlist" --report-dir . - - ../cppcheck --errorlist --inconclusive --xml-version=2 > errorlist.xml - - xmllint --noout errorlist.xml - - ./cppcheck-htmlreport --file ./errorlist.xml --title "errorlist" --report-dir . + - ./check.sh - cd ../ - mkdir install_test - make DESTDIR=install_test install diff --git a/htmlreport/check.sh b/htmlreport/check.sh new file mode 100755 index 000000000..3815480ef --- /dev/null +++ b/htmlreport/check.sh @@ -0,0 +1,27 @@ +#!/bin/bash -ex + + +./cppcheck-htmlreport --file ../gui/test/data/xmlfiles/xmlreport_v1.xml --title "xml1 test" --report-dir . --source-dir ../test/ +./cppcheck-htmlreport --file ../gui/test/data/xmlfiles/xmlreport_v2.xml --title "xml2 test" --report-dir . --source-dir ../test/ +echo -e "\n" + + +../cppcheck ../gui/test --enable=all --inconclusive --xml-version=2 2> gui_test.xml +xmllint --noout gui_test.xml +./cppcheck-htmlreport --file ./gui_test.xml --title "xml2 + inconclusive test" --report-dir . +echo "" + +../cppcheck ../gui/test --enable=all --inconclusive --verbose --xml-version=2 2> gui_test.xml +xmllint --noout gui_test.xml +./cppcheck-htmlreport --file ./gui_test.xml --title "xml2 + inconclusive + verbose test" --report-dir . +echo -e "\n" + + +../cppcheck --errorlist > errorlist.xml +xmllint --noout errorlist.xml +./cppcheck-htmlreport --file ./errorlist.xml --title "errorlist" --report-dir . +echo "" + +../cppcheck --errorlist --inconclusive --xml-version=2 > errorlist.xml +xmllint --noout errorlist.xml +./cppcheck-htmlreport --file ./errorlist.xml --title "errorlist" --report-dir .