Merge pull request #9166 from The-OpenROAD-Project-staging/odb-two-bzl-tests

odb: enable in bzl tests dump_netlists_withfill & dump_netlists_withfill

Author: maliberty

src/odb/test/BUILD

@@ -229,8 +229,6 @@ MANUAL_TESTS = [
 
 # TODO: Enable once difference between bazel and ctest is resolved.
 MANUAL_FOR_BAZEL_TESTS = [
-    "dump_netlists",
-    "dump_netlists_withfill",
     "replace_hier_mod1",
 ]
 

src/odb/test/CMakeLists.txt

@@ -17,6 +17,8 @@ or_integration_tests(
     design_is_routed_fail1
     design_is_routed_fail2
     dont_touch
+    dump_netlists
+    dump_netlists_withfill
     dump_nets
     dump_via_rules
     dump_vias
@@ -66,8 +68,6 @@ or_integration_tests(
     write_macro_placement
   PASSFAIL_TESTS
     cpp_tests
-    dump_netlists
-    dump_netlists_withfill
     test_block
     test_bterm
     test_destroy

src/odb/test/dump_netlists.ok

@@ -0,0 +1,7 @@
+[INFO ODB-0227] LEF file: ../../../test/Nangate45/Nangate45.lef, created 22 layers, 27 vias, 135 library cells
+[INFO ODB-0128] Design: gcd
+[INFO ODB-0130]     Created 54 pins.
+[INFO ODB-0131]     Created 482 components and 2074 component-terminals.
+[INFO ODB-0132]     Created 2 special nets and 964 connections.
+[INFO ODB-0133]     Created 385 nets and 1110 connections.
+No differences found.

src/odb/test/dump_netlists.tcl

@@ -8,11 +8,4 @@ set block [$chip getBlock]
 
 write_cdl -masters NangateOpenCellLibrary.cdl "[make_result_file gcd.cdl]"
 
-set isDiff [diff_files "[make_result_file gcd.cdl]" "dump_netlists_cdl.ok"]
-
-if { $isDiff != 0 } {
-  exit 1
-}
-
-puts "pass"
-exit
+diff_files "[make_result_file gcd.cdl]" dump_netlists_cdl.ok

src/odb/test/dump_netlists_withfill.ok

@@ -0,0 +1,7 @@
+[INFO ODB-0227] LEF file: ../../../test/Nangate45/Nangate45.lef, created 22 layers, 27 vias, 135 library cells
+[INFO ODB-0128] Design: gcd
+[INFO ODB-0130]     Created 54 pins.
+[INFO ODB-0131]     Created 482 components and 2074 component-terminals.
+[INFO ODB-0132]     Created 2 special nets and 964 connections.
+[INFO ODB-0133]     Created 385 nets and 1110 connections.
+No differences found.

src/odb/test/dump_netlists_withfill.tcl

@@ -9,12 +9,4 @@ set block [$chip getBlock]
 
 write_cdl -include_fillers -masters NangateOpenCellLibrary.cdl "[make_result_file gcdwithfill.cdl]"
 
-set isDiff [diff_files "[make_result_file gcdwithfill.cdl]" "dump_netlists_withfill_cdl.ok"]
-
-
-if { $isDiff != 0 } {
-  exit 1
-}
-
-puts "pass"
-exit
+diff_files "[make_result_file gcdwithfill.cdl]" dump_netlists_withfill_cdl.ok