Skip to content

Commit 67f144b

Browse files
committed
Add hash calculation to UT due to hashing functions differing between platforms
1 parent 273da5c commit 67f144b

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

test/testcppcheck.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -530,27 +530,31 @@ class TestCppcheck : public TestFixture {
530530

531531
{
532532
const auto s = dinit(Settings, $.templateFormat = templateFormat, $.plistOutput = "output");
533-
ScopedFile file("file", "");
533+
const ScopedFile file("file", "");
534534
CppCheck cppcheck(s, supprs, errorLogger, false, {});
535-
cppcheck.checkPlistOutput(FileWithDetails(file.path(), Path::identify(file.path(), false), 0), files);
536-
const std::string outputFile {"outputfile_4017852018407011111.plist"};
535+
const FileWithDetails fileWithDetails {file.path(), Path::identify(file.path(), false), 0};
536+
537+
cppcheck.checkPlistOutput(fileWithDetails, files);
538+
const std::string outputFile {"outputfile_" + std::to_string(std::hash<std::string> {}(fileWithDetails.spath())) + ".plist"};
537539
ASSERT(Path::exists(outputFile));
538540
std::remove(outputFile.c_str());
539541
}
540542

541543
{
542544
const auto s = dinit(Settings, $.plistOutput = "output");
543-
ScopedFile file("file.c", "");
545+
const ScopedFile file("file.c", "");
544546
CppCheck cppcheck(s, supprs, errorLogger, false, {});
545-
cppcheck.checkPlistOutput(FileWithDetails(file.path(), Path::identify(file.path(), false), 0), files);
546-
const std::string outputFile {"outputfile_18314070737314589129.plist"};
547+
const FileWithDetails fileWithDetails {file.path(), Path::identify(file.path(), false), 0};
548+
549+
cppcheck.checkPlistOutput(fileWithDetails, files);
550+
const std::string outputFile {"outputfile_" + std::to_string(std::hash<std::string> {}(fileWithDetails.spath())) + ".plist"};
547551
ASSERT(Path::exists(outputFile));
548552
std::remove(outputFile.c_str());
549553
}
550554

551555
{
552556
Settings s;
553-
ScopedFile file("file.c", "");
557+
const ScopedFile file("file.c", "");
554558
CppCheck cppcheck(s, supprs, errorLogger, false, {});
555559
cppcheck.checkPlistOutput(FileWithDetails(file.path(), Path::identify(file.path(), false), 0), files);
556560
}

0 commit comments

Comments
 (0)