From 1495d9521c46ca80d3e3fac94be0219179b59ff6 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 15 Mar 2021 16:51:56 +0100 Subject: [PATCH] Tests updated. --- src/db/unit_tests/dbNetlistCompareTests.cc | 12 ++++++------ testdata/lvs/ringo_simple_with_tol.lvsdb.1 | 8 ++++---- testdata/lvs/ringo_simple_with_tol.lvsdb.2 | 8 ++++---- testdata/ruby/dbNetlistCompare.rb | 12 ++++++------ 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/db/unit_tests/dbNetlistCompareTests.cc b/src/db/unit_tests/dbNetlistCompareTests.cc index ece57b78a..17f102883 100644 --- a/src/db/unit_tests/dbNetlistCompareTests.cc +++ b/src/db/unit_tests/dbNetlistCompareTests.cc @@ -954,7 +954,7 @@ TEST(5_BufferTwoPathsDifferentParameters) EXPECT_EQ (good, false); logger.clear (); - nl2.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_L, 1.5, 0.0)); + nl1.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_L, 1.5, 0.0)); good = comp.compare (&nl1, &nl2); EXPECT_EQ (logger.text (), @@ -980,7 +980,7 @@ TEST(5_BufferTwoPathsDifferentParameters) EXPECT_EQ (good, true); logger.clear (); - nl2.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_L, 0.0, 0.0)); + nl1.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_L, 0.0, 0.0)); good = comp.compare (&nl1, &nl2); EXPECT_EQ (logger.text (), @@ -1006,7 +1006,7 @@ TEST(5_BufferTwoPathsDifferentParameters) EXPECT_EQ (good, false); logger.clear (); - nl2.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_L, 0.0, 0.2)); + nl1.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_L, 0.0, 0.2)); good = comp.compare (&nl1, &nl2); EXPECT_EQ (logger.text (), @@ -1032,7 +1032,7 @@ TEST(5_BufferTwoPathsDifferentParameters) EXPECT_EQ (good, false); logger.clear (); - nl2.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_L, 0.0, 0.4)); + nl1.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_L, 0.0, 0.4)); good = comp.compare (&nl1, &nl2); EXPECT_EQ (logger.text (), @@ -1059,7 +1059,7 @@ TEST(5_BufferTwoPathsDifferentParameters) logger.clear (); db::EqualDeviceParameters eq_dp = db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_W) + db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_L, 0.2, 0.0); - nl2.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (eq_dp)); + nl1.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (eq_dp)); good = comp.compare (&nl1, &nl2); EXPECT_EQ (logger.text (), @@ -1086,7 +1086,7 @@ TEST(5_BufferTwoPathsDifferentParameters) logger.clear (); eq_dp = db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_W) + db::EqualDeviceParameters (db::DeviceClassMOS3Transistor::param_id_L); - nl2.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (eq_dp)); + nl1.device_class_by_name ("NMOS")->set_parameter_compare_delegate (new db::EqualDeviceParameters (eq_dp)); good = comp.compare (&nl1, &nl2); EXPECT_EQ (logger.text (), diff --git a/testdata/lvs/ringo_simple_with_tol.lvsdb.1 b/testdata/lvs/ringo_simple_with_tol.lvsdb.1 index 9521ed1cb..51c6fe9e2 100644 --- a/testdata/lvs/ringo_simple_with_tol.lvsdb.1 +++ b/testdata/lvs/ringo_simple_with_tol.lvsdb.1 @@ -848,13 +848,13 @@ xref( ) circuit(ND2X1 ND2X1 match xref( - net(8 8 mismatch) + net(8 8 match) net(4 4 match) net(6 6 match) net(5 5 match) - net(2 2 mismatch) - net(7 7 mismatch) - net(1 1 mismatch) + net(2 2 match) + net(7 7 match) + net(1 1 match) net(3 3 match) pin(3 3 match) pin(5 5 match) diff --git a/testdata/lvs/ringo_simple_with_tol.lvsdb.2 b/testdata/lvs/ringo_simple_with_tol.lvsdb.2 index 27ca272d4..372bf323d 100644 --- a/testdata/lvs/ringo_simple_with_tol.lvsdb.2 +++ b/testdata/lvs/ringo_simple_with_tol.lvsdb.2 @@ -848,13 +848,13 @@ xref( ) circuit(ND2X1 ND2X1 match xref( - net(8 8 mismatch) + net(8 8 match) net(4 4 match) net(6 6 match) net(5 5 match) - net(2 2 mismatch) - net(7 7 mismatch) - net(1 1 mismatch) + net(2 2 match) + net(7 7 match) + net(1 1 match) net(3 3 match) pin(3 3 match) pin(5 5 match) diff --git a/testdata/ruby/dbNetlistCompare.rb b/testdata/ruby/dbNetlistCompare.rb index efb508138..58b3339ca 100644 --- a/testdata/ruby/dbNetlistCompare.rb +++ b/testdata/ruby/dbNetlistCompare.rb @@ -482,7 +482,7 @@ END logger.clear eqp = RBA::EqualDeviceParameters::new(RBA::DeviceClassMOS3Transistor::PARAM_L, 0.2, 0.0) - nl2.device_class_by_name("NMOS").equal_parameters = eqp + nl1.device_class_by_name("NMOS").equal_parameters = eqp good = comp.compare(nl1, nl2) assert_equal(logger.text, <<"END") @@ -509,8 +509,8 @@ END assert_equal(good, true) logger.clear - nl2.device_class_by_name("NMOS").equal_parameters = nil - assert_equal(nl2.device_class_by_name("NMOS").equal_parameters == nil, true) + nl1.device_class_by_name("NMOS").equal_parameters = nil + assert_equal(nl1.device_class_by_name("NMOS").equal_parameters == nil, true) good = comp.compare(nl1, nl2) assert_equal(logger.text, <<"END") @@ -539,8 +539,8 @@ END logger.clear eqp = RBA::EqualDeviceParameters::new(RBA::DeviceClassMOS3Transistor::PARAM_W, 0.01, 0.0) eqp = eqp + RBA::EqualDeviceParameters::new(RBA::DeviceClassMOS3Transistor::PARAM_L, 0.2, 0.0) - nl2.device_class_by_name("NMOS").equal_parameters = eqp - assert_equal(nl2.device_class_by_name("NMOS").equal_parameters == nil, false) + nl1.device_class_by_name("NMOS").equal_parameters = eqp + assert_equal(nl1.device_class_by_name("NMOS").equal_parameters == nil, false) good = comp.compare(nl1, nl2) assert_equal(logger.text, <<"END") @@ -567,7 +567,7 @@ END assert_equal(good, true) logger.clear - dc = nl2.device_class_by_name("NMOS") + dc = nl1.device_class_by_name("NMOS") dc.equal_parameters = RBA::EqualDeviceParameters::new(RBA::DeviceClassMOS3Transistor::PARAM_W, 0.01, 0.0) dc.equal_parameters += RBA::EqualDeviceParameters::new(RBA::DeviceClassMOS3Transistor::PARAM_L, 0.2, 0.0) good = comp.compare(nl1, nl2)