Resolving conflicts

testdata/drc/drcSimpleTests_152.drc

@@ -0,0 +1,25 @@
+source $drc_test_source
+target $drc_test_target
+
+if $drc_test_deep
+  deep
+end
+
+deep
+
+l1 = input(1, 0, enable_props)
+l1.output(1, 0)
+
+l2 = input(2, 0, enable_props)
+l2.output(2, 0)
+
+l1.sep(l2, 1.um, props_ne).output(100, 0)
+l1.sep(l2, 1.um, props_eq).output(101, 0)
+l1.sep(l2, 1.um).output(102, 0)
+l2.sep(l1, 1.um, props_ne).output(110, 0)
+l2.sep(l1, 1.um, props_eq).output(111, 0)
+l2.sep(l1, 1.um).output(112, 0)
+l1.space(1.um, props_ne).output(120, 0)
+l1.space(1.um, props_eq).output(121, 0)
+l1.space(1.um).output(122, 0)
+

testdata/lefdef/issue-2374/lib1.lef

@@ -0,0 +1,20 @@
+VERSION 5.8 ;
+
+MACRO a
+  ORIGIN 0 0 ;
+  SIZE 600 BY 600 ;
+  OBS 
+    LAYER M1 ;
+      RECT 10 10 590 590 ;
+  END
+END a
+
+MACRO b
+  ORIGIN -600 0 ;
+  SIZE 400 BY 500 ;
+  OBS 
+    LAYER M1 ;
+      RECT 610 10 990 490 ;
+  END
+END b
+

testdata/lefdef/issue-2374/lib2.lef

@@ -0,0 +1,22 @@
+VERSION 5.8 ;
+
+MACRO b
+  ORIGIN -600 0 ;
+  SIZE 400 BY 500 ;
+  OBS 
+    LAYER M1 ;
+      RECT 610 10 990 590 ;
+  END
+END b
+
+MACRO c
+  ORIGIN -500 -500 ;
+  SIZE 500 BY 500 ;
+  OBS 
+    LAYER M1 ;
+      POLYGON 510 610 610 610 610 510 990 510 990 990 510 990 ;
+    LAYER overlap ;
+      RECT 500 700 1000 1000 ;
+      POLYGON 500 600  600 600  600 500  1000 500  1000 700  500 700 ;
+  END
+END c

testdata/lefdef/issue-2374/tech.lef

@@ -0,0 +1,12 @@
+VERSION 5.8 ;
+
+LAYER M1
+  TYPE ROUTING ;
+  DIRECTION HORIZONTAL ;
+  WIDTH 0.1 ;
+  PITCH 0.1 ;
+END M1
+
+LAYER overlap
+  TYPE OVERLAP ;
+END overlap

testdata/lefdef/issue-2374/tech.map

@@ -0,0 +1,6 @@
+DIEAREA ALL 1 0
+#BOUNDARY DIEAREA 1 0
+BOUNDARY MACRO 1 0
+#M1 LEFOBS 2 0
+M1 LEFOBS 3 0
+M1 BLOCKAGE 3 0

testdata/lefdef/issue-2374/top.def

@@ -0,0 +1,10 @@
+VERSION 5.8 ;
+DESIGN top ;
+UNITS DISTANCE MICRONS 1000 ;
+DIEAREA ( 0 0 ) ( 1000000 1000000 ) ;
+COMPONENTS 3 ;
+- a a + PLACED ( 0 0 ) N ;
+- b b + PLACED ( 600000 0 ) N ;
+- c c + PLACED ( 500000 500000 ) N ;
+END COMPONENTS
+END DESIGN

testdata/ruby/dbReaders.rb

@@ -392,6 +392,10 @@ class DBReaders_TestClass < TestBase
     conf.read_lef_with_def = false
     assert_equal(conf.read_lef_with_def, false)
 
+    assert_equal(conf.skip_duplicate_macros, false)
+    conf.skip_duplicate_macros = true
+    assert_equal(conf.skip_duplicate_macros, true)
+
   end
 
   # MAG Options