realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix similar labels ERC to catch all errors

Browse Source 
Logic issue with test was causing QA failures on macOS
due to the order of item iteration changing between
the QA test and eeschema standalone, and the test not
checking more than one possible mismatch per normalized name.
This commit is contained in:
Jon Evans 2024-12-01 15:50:17 -05:00
parent 5cdff00e98
commit 499ed2ef93
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
eeschema/erc/erc.cpp
View File

@ -1237,11 +1237,12 @@ int ERC_TESTER::TestSameLocalGlobalLabel()
int ERC_TESTER::TestSimilarLabels()
{
int errors = 0;
std::unordered_map<wxString, std::tuple<wxString, SCH_ITEM*, SCH_SHEET_PATH>> generalMap;
std::unordered_map<wxString, std::vector<std::tuple<wxString, SCH_ITEM*, SCH_SHEET_PATH>>> generalMap;
auto logError = [&]( const wxString& normalized, SCH_ITEM* item, const SCH_SHEET_PATH& sheet )
auto logError = [&]( const wxString& normalized, SCH_ITEM* item, const SCH_SHEET_PATH& sheet,
const std::tuple<wxString, SCH_ITEM*, SCH_SHEET_PATH>& other )
{
auto& [otherText, otherItem, otherSheet] = generalMap.at( normalized );
auto& [otherText, otherItem, otherSheet] = other;
ERCE_T typeOfWarning = ERCE_SIMILAR_LABELS;
if( item->Type() == SCH_PIN_T && otherItem->Type() == SCH_PIN_T )
@ -1287,17 +1288,17 @@ int ERC_TESTER::TestSimilarLabels()
wxString unnormalized = label->GetShownText( &sheet, false );
wxString normalized = unnormalized.Lower();
if( !generalMap.count( normalized ) )
{
generalMap[normalized] = std::make_tuple( unnormalized, label, sheet );
}
generalMap[normalized].emplace_back( std::make_tuple( unnormalized, label, sheet ) );
auto& [otherText, otherItem, otherSheet] = generalMap.at( normalized );
if( unnormalized != otherText )
for( const auto& otherTuple : generalMap.at( normalized ) )
{
logError( normalized, label, sheet );
errors += 1;
const auto& [otherText, otherItem, otherSheet] = otherTuple;
if( unnormalized != otherText )
{
logError( normalized, label, sheet, otherTuple );
errors += 1;
}
}
break;
@ -1315,17 +1316,17 @@ int ERC_TESTER::TestSimilarLabels()
wxString unnormalized = symbol->GetValue( true, &sheet, false );
wxString normalized = unnormalized.Lower();
if( !generalMap.count( normalized ) )
{
generalMap[normalized] = std::make_tuple( unnormalized, pin, sheet );
}
generalMap[normalized].emplace_back( std::make_tuple( unnormalized, pin, sheet ) );
auto& [otherText, otherItem, otherSheet] = generalMap.at( normalized );
if( unnormalized != otherText )
for( const auto& otherTuple : generalMap.at( normalized ) )
{
logError( normalized, pin, sheet );
errors += 1;
const auto& [otherText, otherItem, otherSheet] = otherTuple;
if( unnormalized != otherText )
{
logError( normalized, pin, sheet, otherTuple );
errors += 1;
}
}
break;