luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing tests after layer names get loaded properly

This commit is contained in:
Matthias Koefferlein 2026-07-18 00:38:38 +02:00
parent edad8f5221
commit 8b867bbc44
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db/db/dbTestSupport.cc
View File

@ -163,8 +163,9 @@ void compare_layouts (tl::TestBase *_this, const db::Layout &layout, const std::
(n > 0 ? db::layout_diff::f_silent : db::layout_diff::f_verbose) (n > 0 ? db::layout_diff::f_silent : db::layout_diff::f_verbose)
| ((norm & AsPolygons) != 0 ? db::layout_diff::f_boxes_as_polygons + db::layout_diff::f_paths_as_polygons : 0) | ((norm & AsPolygons) != 0 ? db::layout_diff::f_boxes_as_polygons + db::layout_diff::f_paths_as_polygons : 0)
| ((norm & WithArrays) != 0 ? 0 : db::layout_diff::f_flatten_array_insts) | ((norm & WithArrays) != 0 ? 0 : db::layout_diff::f_flatten_array_insts)
| ((norm & WithMeta) == 0 ? 0 : db::layout_diff::f_with_meta | ((norm & WithMeta) == 0 ? 0 : db::layout_diff::f_with_meta)
| db::layout_diff::f_smart_cell_mapping) | ((norm & WithoutLayerNames) == 0 ? 0 : db::layout_diff::f_no_layer_names)
| db::layout_diff::f_smart_cell_mapping
/*| db::layout_diff::f_no_text_details | db::layout_diff::f_no_text_orientation*/ /*| db::layout_diff::f_no_text_details | db::layout_diff::f_no_text_orientation*/
, tolerance, 100 /*max diff lines*/); , tolerance, 100 /*max diff lines*/);
@ -176,6 +177,7 @@ void compare_layouts (tl::TestBase *_this, const db::Layout &layout, const std::
| ((norm & AsPolygons) != 0 ? db::layout_diff::f_boxes_as_polygons + db::layout_diff::f_paths_as_polygons : 0) | ((norm & AsPolygons) != 0 ? db::layout_diff::f_boxes_as_polygons + db::layout_diff::f_paths_as_polygons : 0)
| ((norm & WithArrays) != 0 ? 0 : db::layout_diff::f_flatten_array_insts) | ((norm & WithArrays) != 0 ? 0 : db::layout_diff::f_flatten_array_insts)
| ((norm & WithMeta) == 0 ? 0 : db::layout_diff::f_with_meta) | ((norm & WithMeta) == 0 ? 0 : db::layout_diff::f_with_meta)
| ((norm & WithoutLayerNames) == 0 ? 0 : db::layout_diff::f_no_layer_names)
/*| db::layout_diff::f_no_text_details | db::layout_diff::f_no_text_orientation*/ /*| db::layout_diff::f_no_text_details | db::layout_diff::f_no_text_orientation*/
, tolerance, 100 /*max diff lines*/); , tolerance, 100 /*max diff lines*/);

19
src/db/db/dbTestSupport.h
View File

@ -52,15 +52,16 @@ class Texts;
*/ */
enum NormalizationMode enum NormalizationMode
{ {
NoNormalization = 0, // no normalization - take the test subject as it is NoNormalization = 0, // no normalization - take the test subject as it is
WriteGDS2 = 1, // normalize subject by writing to GDS2 and reading back WriteGDS2 = 1, // normalize subject by writing to GDS2 and reading back
WriteOAS = 2, // normalize subject by writing to OASIS and reading back WriteOAS = 2, // normalize subject by writing to OASIS and reading back
NormFileMask = 7, // bits the extract for file mode NormFileMask = 7, // bits the extract for file mode
NoContext = 8, // write tmp file without context NoContext = 8, // write tmp file without context
AsPolygons = 16, // paths and boxes are treated as polygons AsPolygons = 16, // paths and boxes are treated as polygons
WithArrays = 32, // do not flatten arrays WithArrays = 32, // do not flatten arrays
WithMeta = 64, // with meta info WithMeta = 64, // with meta info
WithoutCellNames = 128 // smart cell name mapping WithoutCellNames = 128, // smart cell name mapping
WithoutLayerNames = 256, // don't compare layer names
}; };
/** /**

2
src/plugins/tools/net_tracer/unit_tests/dbTraceAllNets.cc
View File

@ -85,7 +85,7 @@ void run_test (tl::TestBase *_this, const std::string &file, const db::NetTracer
fn += file_au; fn += file_au;
CHECKPOINT (); CHECKPOINT ();
db::compare_layouts (_this, layout_nets, fn, db::NormalizationMode (db::WriteOAS | db::AsPolygons)); db::compare_layouts (_this, layout_nets, fn, db::NormalizationMode (db::WriteOAS | db::AsPolygons | db::WithoutLayerNames));
} }
TEST(1) TEST(1)