From 3db1db831fe021a630f6585c48af59af99a4a995 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 21 Feb 2021 21:23:45 +0100
Subject: [PATCH] Test update after update of LEF/DEF reader.

---
 .../lefdef/unit_tests/dbLEFDEFImportTests.cc  |  22 +++++++++++-------
 testdata/lefdef/mapfile/au.oas.gz             | Bin 1043 -> 1213 bytes
 testdata/lefdef/masks-2/au.oas.gz             | Bin 3190 -> 3290 bytes
 testdata/ruby/dbReaders.rb                    |  12 ++++++++++
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
index 75e473fe1..560712df3 100644
--- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
+++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc
@@ -291,7 +291,7 @@ TEST(16)
   run_test (_this, "def7", "lef:cells.lef+lef:tech.lef+def:in.def.gz", "au-new.oas.gz", options);
 
   options.set_placement_blockage_layer ("PLACEMENT_BLK (60/0)");
-  run_test (_this, "def7", "map:in.map+lef:cells.lef+lef:tech.lef+def:in.def.gz", "au_with_map_file-new.oas.gz", options);
+  run_test (_this, "def7", "map:in.map+lef:cells.lef+lef:tech.lef+def:in.def.gz", "au2_with_map_file-new.oas.gz", options);
 }
 
 TEST(17)
@@ -332,7 +332,7 @@ TEST(21)
 TEST(22)
 {
   db::LEFDEFReaderOptions opt = default_options ();
-  run_test (_this, "def13", "map:test.map+lef:test.lef_5.8+def:top.def.gz", "au.oas.gz", opt);
+  run_test (_this, "def13", "map:test.map+lef:test.lef_5.8+def:top.def.gz", "au2.oas.gz", opt);
 }
 
 TEST(100)
@@ -710,20 +710,26 @@ TEST(117_mapfile_all)
   EXPECT_EQ (lm_read.to_string (),
     "layer_map("
       "'OUTLINE : OUTLINE (1/0)';"
-      "'+M1.LEFOBS;M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/...\\' (1/5)';"
+      "'+M1.LEFOBS;M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/SPNET/...\\' (1/5)';"
       "'+M1.NET;M1.SPNET : \\'M1.NET/SPNET\\' (16/0)';"
       "'+M1.NET : M1.NET (18/0)';"
-      "'+M1.BLK;M1.LEFOBS;M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/...\\' (22/2)';"
-      "'+\\'M1.NET:1\\';\\'M1.PIN:1\\';\\'M1.SPNET:1\\';\\'M1.VIA:1\\' : \\'M1.NET:1/...\\' (6/0)';"
+      "'+M1.BLK;M1.FILL;M1.FILLOPC;M1.LEFOBS;M1.LEFPIN;M1.NET;M1.PIN;M1.SPNET;M1.VIA : \\'M1.NET/PIN/FILL/...\\' (22/2)';"
+      "'+\\'M1.NET:1\\';\\'M1.PIN:1\\';\\'M1.SPNET:1\\';\\'M1.VIA:1\\' : \\'M1.NET:1/PIN:1/...\\' (6/0)';"
       "'+\\'M1.NET:1\\' : \\'M1.NET:1\\' (7/0)';"
       "'+M1.PIN : M1.PIN (3/0)';"
       "'+M1.PIN : M1.PIN (4/0)';"
-      "'+M1.VIA : M1.VIA (20/0)';"
-      "'+M1.VIA : M1.VIA (21/0)';"
+      "'+M1.FILL : M1.FILL (14/0)';"
+      "'+M1.FILL : M1.FILL (15/0)';"
+      "'+M1.FILL : M1.FILL (17/0)';"
+      "'+M1.FILLOPC : M1.FILLOPC (9/0)';"
+      "'\\'M1.FILLOPC:1\\' : \\'M1.FILLOPC:1\\' (10/0)';"
+      "'\\'M1.FILLOPC:2\\' : \\'M1.FILLOPC:2\\' (11/0)';"
+      "'\\'M1.VIA:SIZE0.05X0.05\\' : \\'M1.VIA:SIZE0.05X0.05\\' (20/0)';"
+      "'\\'M1.VIA:SIZE3X3\\' : \\'M1.VIA:SIZE3X3\\' (21/0)';"
       "'+M1.LABEL : M1.LABEL (26/0)';"
       "'+M1.LABEL : M1.LABEL (27/0)';"
       "'+M1.LABEL : M1.LABEL (28/1)';"
-      "'+M1.BLK : M1.BLOCKAGE (13/0)';"
+      "'+M1.BLK : M1.BLK (13/0)';"
       "'M1_TEXT.LABEL : M1_TEXT.LABEL (29/0)'"
     ")"
   )
diff --git a/testdata/lefdef/mapfile/au.oas.gz b/testdata/lefdef/mapfile/au.oas.gz
index 942c568de6f272436bf824a5f90b385709a0b28e..bf3c4bea7585299965d8ea76b58a552e58947610 100644
GIT binary patch
delta 382
zcmbQtv6pkg4Sg|Rg8+X$Ki3fb08c;t-~bRyPfw4Ti<yB3i`>NDmi6quhI($EK0eGm
z%rh8yP<Y&2P&xkqXP|Tn4;r7F2O)1|2vm{EgCT;V#t5h;4MmL+3rJ|PF=KB%8_+N(
zA8#OkIwKD<hg-zg2#cTifPTU$!z~u(>1cpO7dI#*u*sPLg9#`J)@X=DBQI1Vn%w4S
HrX7p`L26Vs

delta 212
zcmdnXIhkX^4P^meg8+X$Ki3fb08c-CJv}{UE@lQE6w%4-jFyv+F!t1Q`x@#w`S?3~
zJG#3v^Ds|m<iQZ(=JPc|F^vys8Wu5bfiO=;0~D3qAbYWig4G)8`N<$Tk{7BNC=3zZ
J%*woj5di2}Em8mg

diff --git a/testdata/lefdef/masks-2/au.oas.gz b/testdata/lefdef/masks-2/au.oas.gz
index 0cceaa128b5334ba2ddfbc2ed792871b2f12f4b1..bb71f6fe6b4cebc65fe7e4565810f857481df80a 100644
GIT binary patch
delta 574
zcmew+aZ7T80Mq0hOj;?zz6JsQdI6q(R)+dMu5MrkGb3{z4=xFAgoF`HhY?W6B}ODI
zs4|oJm{v_TVUC)t#G)1>=xc~>9W&56?84kIVI%{YK~`ZGpWMSdZSo|Ru*o&7Ad8I9
zEn)>*giRP|5kwftB36h+*u*D4W0^Mj4Qt%wPi(*-4D)m}K(~qs6ofb=xDgUa)-i#D
z5UvGPX0iv{s>ylmNs}u$AQoZ-A`8?)Y!YA#AreT&vcN3FCNudQ`>M@fIP931c~*!_
RHs#i3=KG<%Ih9+G5ddQpjTry{

delta 474
zcmca5`AuSj0Mq0JOe-b}Flhzw`5FZH>jilFSsCi<>FF^uGUxGN5#vUP89~)uVnk91
z7o6<I95Y#sWy<75%xWGyzJ^FfGXssr5aEW2Kulm}1{#YYG<gS0#N;WgQzi?rf($i6
zGL#i;D4Gb+P>2Y`P*#YcXhM_K*b*j-v9Fli#s&<AFi%GVBx9LC!GI~ojSzzv%>*(U
zi{Ruv>?xBsaIBcDzyUEFIUrb|hNFpr4Tp$93}=BEjwZM{jMIUMneT`4<eA*M%seYZ
KHlO4cWCQ@2*lGL#

diff --git a/testdata/ruby/dbReaders.rb b/testdata/ruby/dbReaders.rb
index 3c6dcb47e..8288d6c43 100644
--- a/testdata/ruby/dbReaders.rb
+++ b/testdata/ruby/dbReaders.rb
@@ -289,6 +289,18 @@ class DBReaders_TestClass < TestBase
     conf.lef_pins_datatype = 181
     assert_equal(conf.lef_pins_datatype, 181)
 
+    assert_equal(conf.produce_fills, true)
+    conf.produce_fills = false
+    assert_equal(conf.produce_fills, false)
+
+    assert_equal(conf.fills_suffix, ".FILL")
+    conf.fills_suffix = "XFILL"
+    assert_equal(conf.fills_suffix, "XFILL")
+
+    assert_equal(conf.fills_datatype, 5)
+    conf.fills_datatype = 19
+    assert_equal(conf.fills_datatype, 19)
+
     assert_equal(conf.produce_obstructions, true)
     conf.produce_obstructions = false
     assert_equal(conf.produce_obstructions, false)