From 8e1dadbe591f7f82742bb9fc0e00fdfc1ce1063b Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Thu, 13 Jun 2019 09:02:47 +0200 Subject: [PATCH] Updated golden data of unit tests. --- src/db/db/dbLayoutToNetlist.cc | 2 +- testdata/algo/l2n_writer_au.gds | Bin 18548 -> 6856 bytes testdata/algo/l2n_writer_au_2.gds | Bin 27126 -> 14582 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/db/db/dbLayoutToNetlist.cc b/src/db/db/dbLayoutToNetlist.cc index 05c273c79..eb72fad6e 100644 --- a/src/db/db/dbLayoutToNetlist.cc +++ b/src/db/db/dbLayoutToNetlist.cc @@ -700,7 +700,7 @@ LayoutToNetlist::build_net_rec (db::cell_index_type ci, size_t cid, db::Layout & } } - bool consider_cell = !deliver_shapes_of_net (hier_mode == BNH_Flatten, mp_netlist.get (), m_net_clusters, ci, cid, sof_lmap, tr, 0); + bool consider_cell = ! deliver_shapes_of_net (hier_mode == BNH_Flatten, mp_netlist.get (), m_net_clusters, ci, cid, sof_lmap, tr, 0); if (! consider_cell) { // shortcut if cell is empty -> no net cell will be produced return; diff --git a/testdata/algo/l2n_writer_au.gds b/testdata/algo/l2n_writer_au.gds index ff863024361e56b4d9fe2071a86c1618c4049263..ed3ae89985680bc749def05202defb44cc35eb36 100644 GIT binary patch delta 886 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