Fix #13012: Duplicated misra warnings from misra.py and premiumaddon are not filtered properly in windows (danmar#6703)

swasti16 · web-flow · commit 1b7dd3aaa6f4 · 2024-08-16T15:39:07.000+02:00
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -669,6 +669,8 @@ void Settings::setMisraRuleTexts(const std::string& data)
         std::string text = line.substr(pos + 1);
         if (id.empty() || text.empty())
             continue;
+        if (text[text.size() -1] == '\r')
+            text.erase(text.size() -1);
         mMisraRuleTexts[id] = std::move(text);
     }
 }
diff --git a/test/testsettings.cpp b/test/testsettings.cpp
@@ -263,9 +263,10 @@ class TestSettings : public TestFixture {
     void ruleTexts() const
     {
         Settings s;
-        s.setMisraRuleTexts("1.1 text 1\n1.2 text 2\n");
+        s.setMisraRuleTexts("1.1 text 1\n1.2 text 2\n1.3 text 3\r\n");
         ASSERT_EQUALS("text 1", s.getMisraRuleText("misra-c2012-1.1", "---"));
         ASSERT_EQUALS("text 2", s.getMisraRuleText("misra-c2012-1.2", "---"));
+        ASSERT_EQUALS("text 3", s.getMisraRuleText("misra-c2012-1.3", "---"));
     }
 
     void checkLevelDefault() const

Original file line number	Diff line number	Diff line change
`@@ -669,6 +669,8 @@ void Settings::setMisraRuleTexts(const std::string& data)`
`669`	`669`	`std::string text = line.substr(pos + 1);`
`670`	`670`	`if (id.empty() \|\| text.empty())`
`671`	`671`	`continue;`
	`672`	`+ if (text[text.size() -1] == '\r')`
	`673`	`+ text.erase(text.size() -1);`
`672`	`674`	`mMisraRuleTexts[id] = std::move(text);`
`673`	`675`	`}`
`674`	`676`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,9 +263,10 @@ class TestSettings : public TestFixture {`
`263`	`263`	`void ruleTexts() const`
`264`	`264`	`{`
`265`	`265`	`Settings s;`
`266`		`- s.setMisraRuleTexts("1.1 text 1\n1.2 text 2\n");`
	`266`	`+ s.setMisraRuleTexts("1.1 text 1\n1.2 text 2\n1.3 text 3\r\n");`
`267`	`267`	`ASSERT_EQUALS("text 1", s.getMisraRuleText("misra-c2012-1.1", "---"));`
`268`	`268`	`ASSERT_EQUALS("text 2", s.getMisraRuleText("misra-c2012-1.2", "---"));`
	`269`	`+ ASSERT_EQUALS("text 3", s.getMisraRuleText("misra-c2012-1.3", "---"));`
`269`	`270`	`}`
`270`	`271`
`271`	`272`	`void checkLevelDefault() const`