Merge branch 'master' into complex_drc_ops

testdata/algo/nreader9.cir

@@ -1,10 +1,18 @@
 
 R$1 1 2 1.7k M=2
 R$2 3 4 1.7k
+R$3 1 2 1.7k RMODEL M=2
+R$4 3 4 1.7k RMODEL
 M$1 1 2 3 4 NMOS W=2u L=7u M=2
 M$2 1 2 3 4 PMOS W=2u L=7u 
 C$1 1 2 1e-9 M=2 
 C$2 3 4 1e-9 
+C$3 1 2 1e-9 CMODEL M=2 
+C$4 3 4 1e-9 CMODEL 
+L$1 1 2 1e-9 M=2 
+L$2 3 4 1e-9 
+L$3 1 2 1e-9 LMODEL M=2 
+L$4 3 4 1e-9 LMODEL 
 D$1 1 2 DIODE A=10P M=2 
 D$2 3 4 DIODE A=10P
 Q$1 1 2 3 4 BIP AE=10P M=2 

testdata/drc/drcSimpleTests_17.drc

@@ -0,0 +1,42 @@
+
+source($drc_test_source)
+in_cell     = source.select("-", "+S*")
+not_in_cell = source.select("-SPECIAL")
+in_cell_local = source.select("-*", "+SPECIAL")
+not_in_cell_local = source.select("+*", "-SPECIAL")
+
+target($drc_test_target)
+
+deep 
+
+input(2,0).output(2, 0)
+input(3,0).output(3, 0)
+
+flat
+
+in_cell.input(2, 0).output(102, 0)
+in_cell.input(3, 0).output(103, 0)
+
+not_in_cell.input(2, 0).output(202, 0)
+not_in_cell.input(3, 0).output(203, 0)
+
+in_cell_local.input(2, 0).output(302, 0)
+in_cell_local.input(3, 0).output(303, 0)
+
+not_in_cell_local.input(2, 0).output(402, 0)
+not_in_cell_local.input(3, 0).output(403, 0)
+
+deep 
+
+in_cell.input(2, 0).output(502, 0)
+in_cell.input(3, 0).output(503, 0)
+
+not_in_cell.input(2, 0).output(602, 0)
+not_in_cell.input(3, 0).output(603, 0)
+
+in_cell_local.input(2, 0).output(702, 0)
+in_cell_local.input(3, 0).output(703, 0)
+
+not_in_cell_local.input(2, 0).output(802, 0)
+not_in_cell_local.input(3, 0).output(803, 0)
+

testdata/oasis/t2.4.ot

@@ -7,10 +7,10 @@
 #   <test-intention>Explicit assignment of ID's</test-intention>
 #   <content>
 #     begin_lib 0.001
-#     begin_cell {ABC}
-#     end_cell
 #     begin_cell {XYZ}
 #     end_cell
+#     begin_cell {ABC}
+#     end_cell
 #     end_lib
 #   </content>
 # </test>

testdata/oasis/t2.4_au.txt

@@ -1,6 +1,6 @@
 begin_lib 0.001
-begin_cell {ABC}
-end_cell
 begin_cell {XYZ}
 end_cell
+begin_cell {ABC}
+end_cell
 end_lib

testdata/oasis/t2.6_au.txt

@@ -1,6 +1,6 @@
 begin_lib 0.001
-begin_cell {ABC}
-end_cell
 begin_cell { XYZ}
 end_cell
+begin_cell {ABC}
+end_cell
 end_lib

testdata/ruby/dbReaders.rb

@@ -53,6 +53,14 @@ class DBReaders_TestClass < TestBase
     opt.properties_enabled = false
     assert_equal(opt.properties_enabled?, false)
 
+    assert_equal(opt.cell_conflict_resolution, RBA::LoadLayoutOptions::AddToCell)
+    opt.cell_conflict_resolution = RBA::LoadLayoutOptions::OverwriteCell
+    assert_equal(opt.cell_conflict_resolution, RBA::LoadLayoutOptions::OverwriteCell)
+    opt.cell_conflict_resolution = RBA::LoadLayoutOptions::SkipNewCell
+    assert_equal(opt.cell_conflict_resolution, RBA::LoadLayoutOptions::SkipNewCell)
+    opt.cell_conflict_resolution = RBA::LoadLayoutOptions::RenameCell
+    assert_equal(opt.cell_conflict_resolution, RBA::LoadLayoutOptions::RenameCell)
+
   end
 
   # GDS2 Options