From fea594ff69a1a3fa2fc4c98a724e9ee7690d3d9a Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 14 Mar 2021 23:51:20 +0100
Subject: [PATCH] Unit tests modified because of interface change for netlist
 comparer

---
 src/db/db/dbLayoutVsSchematicWriter.cc |  8 +++++---
 testdata/ruby/dbNetlistCompare.rb      | 18 +++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/db/db/dbLayoutVsSchematicWriter.cc b/src/db/db/dbLayoutVsSchematicWriter.cc
index 14a2b1c13..527429b74 100644
--- a/src/db/db/dbLayoutVsSchematicWriter.cc
+++ b/src/db/db/dbLayoutVsSchematicWriter.cc
@@ -159,9 +159,11 @@ static std::string net_id_to_s (const db::Net *net, const std::map<const db::Net
 
 static void build_pin_index_map (const db::Circuit *c, std::map<const db::Pin *, unsigned int> &pin2index)
 {
-  size_t pi = 0;
-  for (db::Circuit::const_pin_iterator p = c->begin_pins (); p != c->end_pins (); ++p, ++pi) {
-    pin2index.insert (std::make_pair (p.operator-> (), pi));
+  if (c) {
+    size_t pi = 0;
+    for (db::Circuit::const_pin_iterator p = c->begin_pins (); p != c->end_pins (); ++p, ++pi) {
+      pin2index.insert (std::make_pair (p.operator-> (), pi));
+    }
   }
 }
 
diff --git a/testdata/ruby/dbNetlistCompare.rb b/testdata/ruby/dbNetlistCompare.rb
index e95a62a07..efb508138 100644
--- a/testdata/ruby/dbNetlistCompare.rb
+++ b/testdata/ruby/dbNetlistCompare.rb
@@ -33,7 +33,7 @@ class NetlistCompareTestLogger < RBA::GenericNetlistCompareLogger
     @texts << text
   end
 
-  def device_class_mismatch(a, b)
+  def device_class_mismatch(a, b, msg)
     out("device_class_mismatch " + dc2str(a) + " " + dc2str(b))
   end
 
@@ -41,15 +41,15 @@ class NetlistCompareTestLogger < RBA::GenericNetlistCompareLogger
     out("begin_circuit " + circuit2str(a) + " " + circuit2str(b))
   end
 
-  def end_circuit(a, b, matching)
+  def end_circuit(a, b, matching, msg)
     out("end_circuit " + circuit2str(a) + " " + circuit2str(b) + " " + (matching ? "MATCH" : "NOMATCH"))
   end
 
-  def circuit_skipped(a, b)
+  def circuit_skipped(a, b, msg)
     out("circuit_skipped " + circuit2str(a) + " " + circuit2str(b))
   end
 
-  def circuit_mismatch(a, b)
+  def circuit_mismatch(a, b, msg)
     out("circuit_mismatch " + circuit2str(a) + " " + circuit2str(b))
   end
 
@@ -57,11 +57,11 @@ class NetlistCompareTestLogger < RBA::GenericNetlistCompareLogger
     out("match_nets " + net2str(a) + " " + net2str(b))
   end
 
-  def match_ambiguous_nets(a, b)
+  def match_ambiguous_nets(a, b, msg)
     out("match_ambiguous_nets " + net2str(a) + " " + net2str(b))
   end
 
-  def net_mismatch(a, b)
+  def net_mismatch(a, b, msg)
     out("net_mismatch " + net2str(a) + " " + net2str(b))
   end
 
@@ -69,7 +69,7 @@ class NetlistCompareTestLogger < RBA::GenericNetlistCompareLogger
     out("match_devices " + device2str(a) + " " + device2str(b))
   end
 
-  def device_mismatch(a, b)
+  def device_mismatch(a, b, msg)
     out("device_mismatch " + device2str(a) + " " + device2str(b))
   end
 
@@ -85,7 +85,7 @@ class NetlistCompareTestLogger < RBA::GenericNetlistCompareLogger
     out("match_pins " + pin2str(a) + " " + pin2str(b))
   end
 
-  def pin_mismatch(a, b)
+  def pin_mismatch(a, b, msg)
     out("pin_mismatch " + pin2str(a) + " " + pin2str(b))
   end
 
@@ -93,7 +93,7 @@ class NetlistCompareTestLogger < RBA::GenericNetlistCompareLogger
     out("match_subcircuits " + subcircuit2str(a) + " " + subcircuit2str(b))
   end
 
-  def subcircuit_mismatch(a, b)
+  def subcircuit_mismatch(a, b, msg)
     out("subcircuit_mismatch " + subcircuit2str(a) + " " + subcircuit2str(b))
   end