Skip to content

Xml description addition #6237

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

Closed
wants to merge 5 commits into from
Closed

Xml description addition #6237

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c06afa
Output description in XML
TGWDB Jul 20, 2021
0b88930
Fix regression test using XML output
TGWDB Jul 20, 2021
624743d
Update XML schema to allow description in results
TGWDB Jul 20, 2021
6f521a4
Skip tests that display unprintable characters in XML
TGWDB Jul 20, 2021
cb2457b
Add KNOWNBUG regression test for printing special operators
TGWDB Jul 20, 2021
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
5 changes: 4 additions & 1 deletion regression/validate-trace-xml-schema/check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@
# the SAT back-end only
['integer-assignments1', 'test.desc'],
# this test is expected to abort, thus producing invalid XML
['String_Abstraction17', 'test.desc']
['String_Abstraction17', 'test.desc'],
# these tests use characters that cannot be displayed in XML
['ACSL', 'operators.desc'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚫 If the changes cause output to include more characters that are invalid XML then they should not be merged. The correct thing to do would be to escape these characters.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For details of how escaping works in XML see - https://www.w3.org/TR/REC-xml/#syntax
I think the code for this escaping exists already. See xmlt::escape_attribute in src/util/xml.cpp.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

☝️ What he said. Let's not generate invalid XML.

['ACSL', 'quantifier-precedence.desc']
]))

# TODO maybe consider looking them up on PATH, but direct paths are
Expand Down