fixed #13391 - fixed missing file0 in cached XML results

Author: firewave

lib/errorlogger.cpp

@@ -170,6 +170,9 @@ ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
     const char *attr = errmsg->Attribute("id");
     id = attr ? attr : unknown;
 
+    attr = errmsg->Attribute("file0");
+    file0 = attr ? attr : "";
+
     attr = errmsg->Attribute("severity");
     severity = attr ? severityFromString(attr) : Severity::none;
 

test/cli/other_test.py

@@ -2491,11 +2491,7 @@ def test_dump_check_config(tmp_path):  # #13432
     assert not os.path.exists(str(test_file) + '.dump')
 
 
-@pytest.mark.xfail(strict=True)
-def test_xml_builddir(tmp_path):  # #13391 / #13485
-    build_dir = tmp_path / 'b1'
-    os.mkdir(build_dir)
-
+def test_xml_output(tmp_path):  # #13391 / #13485
     test_file = tmp_path / 'test.cpp'
     with open(test_file, 'wt') as f:
         f.write("""
@@ -2506,21 +2502,22 @@ def test_xml_builddir(tmp_path):  # #13391 / #13485
 }
 """)
 
+    _, version_str, _ = cppcheck(['--version'])
+    version_str = version_str.replace('Cppcheck ', '').strip()
+
     args = [
         '-q',
         '--enable=style',
-        '--cppcheck-build-dir={}'.format(build_dir),
         '--xml',
         str(test_file)
     ]
     exitcode_1, stdout_1, stderr_1 = cppcheck(args)
     assert exitcode_1 == 0, stdout_1
     assert stdout_1 == ''
-    # TODO: handle version
     assert (stderr_1 ==
 '''<?xml version="1.0" encoding="UTF-8"?>
 <results version="2">
-    <cppcheck version="2.17 dev"/>
+    <cppcheck version="{}"/>
     <errors>
         <error id="nullPointerRedundantCheck" severity="warning" msg="Either the condition &apos;p&apos; is redundant or there is possible null pointer dereference: p." verbose="Either the condition &apos;p&apos; is redundant or there is possible null pointer dereference: p." cwe="476" file0="{}" remark="boom">
             <location file="{}" line="5" column="12" info="Null pointer dereference"/>
@@ -2529,9 +2526,4 @@ def test_xml_builddir(tmp_path):  # #13391 / #13485
         </error>
     </errors>
 </results>
-'''.format(test_file, test_file, test_file))
-
-    exitcode_2, stdout_2, stderr_2 = cppcheck(args)
-    assert exitcode_1 == exitcode_2, stdout_2
-    assert stdout_1 == stdout_2
-    assert stderr_1 == stderr_2
+'''.format(version_str, str(test_file).replace('\\', '/'), test_file, test_file))  # TODO: the slashes are inconsistent