Skip to content

#8611 Rename xmlV2.rng. Renaming it to cppcheck-errors.rng #1278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amai2012 merged 1 commit into from
Jun 6, 2018
Merged

#8611 Rename xmlV2.rng. Renaming it to cppcheck-errors.rng #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ script:
# run extra tests
- tools/generate_and_run_more_tests.sh
# Validate XML
# - make validateXMLV2
# - make validateXML doesn't work in this context unfortunately
- ${CPPCHECK} --errorlist >/tmp/errorlist.xml
- xmllint --noout --relaxng xmlV2.rng /tmp/errorlist.xml
- xmllint --noout --relaxng cppcheck-errors.rng /tmp/errorlist.xml
# check test/cfg
- make checkcfg
- make validateCFG
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,10 @@ validatePlatforms: ${PlatformFilesCHECKED}
/tmp/example.xml: cppcheck
cppcheck --xml --inconclusive -j 4 cli externals gui lib test 2>/tmp/example.xml
createXMLExamples:/tmp/errorlist.xml /tmp/example.xml
.PHONY: validateXMLV2
validateXMLV2: createXMLExamples
xmllint --noout --relaxng xmlV2.rng /tmp/errorlist.xml
xmllint --noout --relaxng xmlV2.rng /tmp/example.xml
.PHONY: validateXML
validateXML: createXMLExamples
xmllint --noout --relaxng cppcheck-errors.rng /tmp/errorlist.xml
xmllint --noout --relaxng cppcheck-errors.rng /tmp/example.xml

###### Build

Expand Down
0 xmlV2.rng → cppcheck-errors.rng
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions tools/dmake.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,10 +420,10 @@ int main(int argc, char **argv)
fout << "/tmp/example.xml: cppcheck\n";
fout << "\tcppcheck --xml --inconclusive -j 4 cli externals gui lib test 2>/tmp/example.xml\n";
fout << "createXMLExamples:/tmp/errorlist.xml /tmp/example.xml\n";
fout << ".PHONY: validateXMLV2\n";
fout << "validateXMLV2: createXMLExamples\n";
fout << "\txmllint --noout --relaxng xmlV2.rng /tmp/errorlist.xml\n";
fout << "\txmllint --noout --relaxng xmlV2.rng /tmp/example.xml\n";
fout << ".PHONY: validateXML\n";
fout << "validateXML: createXMLExamples\n";
fout << "\txmllint --noout --relaxng cppcheck-errors.rng /tmp/errorlist.xml\n";
fout << "\txmllint --noout --relaxng cppcheck-errors.rng /tmp/example.xml\n";

fout << "\n###### Build\n\n";

Expand Down