Skip to content

Commit d20bbdc

Browse files
authored
Fix #15207 Windows: "failed to open '<build-dir>/X.a1'" with --cppcheck-build-dir, -j and addons (#9019)
1 parent 6943b20 commit d20bbdc

3 files changed

Lines changed: 50 additions & 4 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ test/options.o: test/options.cpp lib/config.h lib/timer.h test/options.h
748748
test/test64bit.o: test/test64bit.cpp lib/check.h lib/check64bit.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
749749
$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/test64bit.cpp
750750

751-
test/testanalyzerinformation.o: test/testanalyzerinformation.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/utils.h lib/xml.h test/fixture.h
751+
test/testanalyzerinformation.o: test/testanalyzerinformation.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h
752752
$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testanalyzerinformation.cpp
753753

754754
test/testassert.o: test/testassert.cpp lib/check.h lib/checkassert.h lib/checkers.h lib/checkimpl.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h

‎lib/analyzerinfo.cpp‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,18 @@
3333

3434
#include "xml.h"
3535

36+
// Not XMLDocument::LoadFile(): with MSVC it denies writing, and addons inherit the handle (#15207)
37+
static tinyxml2::XMLError loadFile(tinyxml2::XMLDocument &doc, const std::string &filename)
38+
{
39+
std::ifstream fin(filename, std::ios::binary);
40+
if (!fin.is_open())
41+
return tinyxml2::XML_ERROR_FILE_NOT_FOUND;
42+
std::ostringstream ostr;
43+
ostr << fin.rdbuf();
44+
const std::string data = ostr.str();
45+
return doc.Parse(data.data(), data.size());
46+
}
47+
3648
AnalyzerInformation::~AnalyzerInformation()
3749
{
3850
close();
@@ -81,7 +93,7 @@ std::set<std::string> AnalyzerInformation::getIncludes(const std::string &buildD
8193
const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(buildDir, sourcefile, cfg, fsFileId);
8294

8395
tinyxml2::XMLDocument analyzerInfoDoc;
84-
if (analyzerInfoDoc.LoadFile(analyzerInfoFile.c_str()) != tinyxml2::XML_SUCCESS)
96+
if (loadFile(analyzerInfoDoc, analyzerInfoFile) != tinyxml2::XML_SUCCESS)
8597
return files;
8698

8799
const tinyxml2::XMLElement *const rootNode = analyzerInfoDoc.FirstChildElement();
@@ -239,7 +251,7 @@ bool AnalyzerInformation::analyzeFile(const std::string &buildDir, const std::st
239251

240252
{
241253
tinyxml2::XMLDocument analyzerInfoDoc;
242-
const tinyxml2::XMLError xmlError = analyzerInfoDoc.LoadFile(analyzerInfoFile.c_str());
254+
const tinyxml2::XMLError xmlError = loadFile(analyzerInfoDoc, analyzerInfoFile);
243255
if (xmlError == tinyxml2::XML_SUCCESS) {
244256
const std::string err = skipAnalysis(analyzerInfoDoc, hash, errors);
245257
if (err.empty()) {
@@ -324,7 +336,7 @@ std::string AnalyzerInformation::processFilesTxt(const std::string& buildDir, co
324336
const std::string xmlfile = buildDir + '/' + filesTxtInfo.afile;
325337

326338
tinyxml2::XMLDocument doc;
327-
const tinyxml2::XMLError error = doc.LoadFile(xmlfile.c_str());
339+
const tinyxml2::XMLError error = loadFile(doc, xmlfile);
328340
if (error == tinyxml2::XML_ERROR_FILE_NOT_FOUND) {
329341
/* FIXME: this can currently not be reported as an error because:
330342
* - --clang does not generate any analyzer information - see #14456

‎test/testanalyzerinformation.cpp‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,14 @@
2121
#include "errorlogger.h"
2222
#include "filesettings.h"
2323
#include "fixture.h"
24+
#include "helpers.h"
2425
#include "standards.h"
2526

27+
#include <fstream>
2628
#include <list>
29+
#include <set>
2730
#include <sstream>
31+
#include <string>
2832

2933
#include "xml.h"
3034

@@ -45,6 +49,7 @@ class TestAnalyzerInformation : public TestFixture {
4549
TEST_CASE(filesTextDuplicateFile);
4650
TEST_CASE(parse);
4751
TEST_CASE(skipAnalysis);
52+
TEST_CASE(loadFileOpenForWriting);
4853
}
4954

5055
void getAnalyzerInfoFileFromFilesTxt() const {
@@ -309,6 +314,35 @@ class TestAnalyzerInformation : public TestFixture {
309314
ASSERT_EQUALS(0, errorList.size());
310315
}
311316
}
317+
318+
void loadFileOpenForWriting() const {
319+
const std::string buildDir = "testanalyzerinfo-builddir";
320+
const ScopedFile file("file1.c.analyzerinfo",
321+
"<?xml version=\"1.0\"?>\n"
322+
"<analyzerinfo>\n"
323+
" <includes>\n"
324+
" <filename>file1.h</filename>\n"
325+
" </includes>\n"
326+
" <hash>123</hash>\n"
327+
"</analyzerinfo>\n",
328+
buildDir);
329+
330+
std::ofstream writer(file.path(), std::ios::app);
331+
ASSERT(writer.is_open());
332+
333+
{
334+
const AnalyzerInformation analyzerInfo;
335+
const std::set<std::string> includes = analyzerInfo.getIncludes(buildDir, "file1.c", "", 0);
336+
ASSERT_EQUALS(1, includes.size());
337+
ASSERT_EQUALS("file1.h", *includes.cbegin());
338+
}
339+
{
340+
AnalyzerInformation analyzerInfo;
341+
std::list<ErrorMessage> errorList;
342+
ASSERT_EQUALS(false, analyzerInfo.analyzeFile(buildDir, "file1.c", "", 0, 123, errorList));
343+
ASSERT_EQUALS(0, errorList.size());
344+
}
345+
}
312346
};
313347

314348
REGISTER_TEST(TestAnalyzerInformation)

0 commit comments

Comments
 (0)