From 88ee2e269f3a6acf470f559c79a8a9a24879a47a Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 2 Jan 2022 14:56:15 +0000 Subject: [PATCH] Remove some video nets from order testing. Conflicting nets are disambiguated with "_n" suffixes, but the order of these is not deterministic. --- qa/eeschema/test_netlists.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/qa/eeschema/test_netlists.cpp b/qa/eeschema/test_netlists.cpp index 92bc05572c..e51d241c66 100644 --- a/qa/eeschema/test_netlists.cpp +++ b/qa/eeschema/test_netlists.cpp @@ -197,6 +197,13 @@ void TEST_NETLISTS_FIXTURE::compareNetlists() const COMPONENT_NET& goldenNet = goldenComp->GetNet( net ); const COMPONENT_NET& testNet = refComp->GetNet( net ); + // The video test has a bunch of unconnected RESERVED pins which cause duplicate + // auto-generated netnames. The connectivity algo disambiguates these with "_n" + // suffixes, but since the algorithm is multi-threaded which ones get which suffix + // is not deterministic. So skip these. + if( testNet.GetPinName().Contains( "RESERVED" ) ) + continue; + // The two nets at the same index should be identical BOOST_REQUIRE_EQUAL( goldenNet.GetNetName(), testNet.GetNetName() ); BOOST_REQUIRE_EQUAL( goldenNet.GetPinName(), testNet.GetPinName() );