diff --git a/src/drc/unit_tests/drcSimpleTests.cc b/src/drc/unit_tests/drcSimpleTests.cc index 2547f4e9b..46abfdfe1 100644 --- a/src/drc/unit_tests/drcSimpleTests.cc +++ b/src/drc/unit_tests/drcSimpleTests.cc @@ -756,47 +756,7 @@ TEST(16_issue570) db::compare_layouts (_this, layout, au, db::NoNormalization); } -TEST(17_breaking) -{ - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_17.drc"; - - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_17.gds"; - - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au17.gds"; - - std::string output = this->tmp_file ("tmp.gds"); - - { - // Set some variables - lym::Macro config; - config.set_text (tl::sprintf ( - "$drc_test_source = '%s'\n" - "$drc_test_target = '%s'\n" - , input, output) - ); - config.set_interpreter (lym::Macro::Ruby); - EXPECT_EQ (config.run (), 0); - } - - lym::Macro drc; - drc.load_from (rs); - EXPECT_EQ (drc.run (), 0); - - db::Layout layout; - - { - tl::InputStream stream (output); - db::Reader reader (stream); - reader.read (layout); - } - - db::compare_layouts (_this, layout, au, db::NoNormalization); -} - -TEST(18_breaking) +TEST(18_forget) { std::string rs = tl::testsrc (); rs += "/testdata/drc/drcSimpleTests_18.drc"; @@ -916,3 +876,43 @@ TEST(20_interact_with_count) db::compare_layouts (_this, layout, au, db::NoNormalization); } +TEST(21_breaking) +{ + std::string rs = tl::testsrc (); + rs += "/testdata/drc/drcSimpleTests_21.drc"; + + std::string input = tl::testsrc (); + input += "/testdata/drc/drcSimpleTests_21.gds"; + + std::string au = tl::testsrc (); + au += "/testdata/drc/drcSimpleTests_au21.gds"; + + std::string output = this->tmp_file ("tmp.gds"); + + { + // Set some variables + lym::Macro config; + config.set_text (tl::sprintf ( + "$drc_test_source = '%s'\n" + "$drc_test_target = '%s'\n" + , input, output) + ); + config.set_interpreter (lym::Macro::Ruby); + EXPECT_EQ (config.run (), 0); + } + + lym::Macro drc; + drc.load_from (rs); + EXPECT_EQ (drc.run (), 0); + + db::Layout layout; + + { + tl::InputStream stream (output); + db::Reader reader (stream); + reader.read (layout); + } + + db::compare_layouts (_this, layout, au, db::NoNormalization); +} + diff --git a/testdata/drc/drcSimpleTests_18.drc b/testdata/drc/drcSimpleTests_18.drc index 6f1ce97bb..48d347615 100644 --- a/testdata/drc/drcSimpleTests_18.drc +++ b/testdata/drc/drcSimpleTests_18.drc @@ -1,5 +1,5 @@ -# Hierarchical antenna check +# "forget" source($drc_test_source, "TOP") target($drc_test_target) diff --git a/testdata/drc/drcSimpleTests_19.drc b/testdata/drc/drcSimpleTests_19.drc index e7c403d11..60d92f511 100644 --- a/testdata/drc/drcSimpleTests_19.drc +++ b/testdata/drc/drcSimpleTests_19.drc @@ -1,5 +1,5 @@ -# Hierarchical antenna check +# shielded/transparent source($drc_test_source, "TOP") target($drc_test_target) diff --git a/testdata/drc/drcSimpleTests_20.drc b/testdata/drc/drcSimpleTests_20.drc index 9bd481a5e..c5c803995 100644 --- a/testdata/drc/drcSimpleTests_20.drc +++ b/testdata/drc/drcSimpleTests_20.drc @@ -1,5 +1,5 @@ -# Hierarchical antenna check +# Interact with count source($drc_test_source, "TOP") target($drc_test_target) diff --git a/testdata/drc/drcSimpleTests_17.drc b/testdata/drc/drcSimpleTests_21.drc similarity index 94% rename from testdata/drc/drcSimpleTests_17.drc rename to testdata/drc/drcSimpleTests_21.drc index 1b3573d39..8eded9eae 100644 --- a/testdata/drc/drcSimpleTests_17.drc +++ b/testdata/drc/drcSimpleTests_21.drc @@ -1,5 +1,5 @@ -# Hierarchical antenna check +# Breaking source($drc_test_source, "TOP") target($drc_test_target) diff --git a/testdata/drc/drcSimpleTests_17.gds b/testdata/drc/drcSimpleTests_21.gds similarity index 100% rename from testdata/drc/drcSimpleTests_17.gds rename to testdata/drc/drcSimpleTests_21.gds diff --git a/testdata/drc/drcSimpleTests_au17.gds b/testdata/drc/drcSimpleTests_au21.gds similarity index 100% rename from testdata/drc/drcSimpleTests_au17.gds rename to testdata/drc/drcSimpleTests_au21.gds