Merge pull request #7257 from hzeller/feature-20250502-add-more-test

Wire up TestPolygonalFloorplan test.

Author: maliberty

src/odb/test/BUILD

@@ -171,6 +171,7 @@ filegroup(
         "sky130hd/sky130hd_vt.tlef",
         "sky130hd/work_around_yosys/formal_pdk.v",
     ],
+    visibility = ["//src/odb/test/cpp:__subpackages__"],
 )
 
 [

src/odb/test/cpp/BUILD

@@ -44,4 +44,23 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "TestPolygonalFloorplan",
+    srcs = ["TestPolygonalFloorplan.cc",
+            "nangate45_test_fixture.h"],
+    defines = [
+        'DATA_PREFIX=\\"src/odb/test/\\"',  # TODO: not needed after no cmake
+    ],
+    data = [
+        "//src/odb/test:regression_resources",
+    ],
+    linkstatic = True,  # TODO: remove once deps define all symbols
+    deps = [
+        "//src/odb",
+        "//src/utl",
+        "@googletest//:gtest",
+        "@googletest//:gtest_main",
+    ],
+)
+
 # TODO: more to come.

src/odb/test/cpp/TestPolygonalFloorplan.cc

@@ -18,6 +18,11 @@
 #include "odb/defin.h"
 #include "utl/Logger.h"
 
+// TODO: not needed after fully switching to bazel
+#ifndef DATA_PREFIX
+#define DATA_PREFIX ""
+#endif
+
 namespace odb {
 
 TEST_F(Nangate45TestFixture, PolygonalFloorplanCreatesBlockagesInNegativeSpace)
@@ -27,8 +32,10 @@ TEST_F(Nangate45TestFixture, PolygonalFloorplanCreatesBlockagesInNegativeSpace)
   std::vector<dbLib*> libs = {lib_.get()};
 
   // Act
-  dbChip* chip = def_parser.createChip(
-      libs, "data/nangate45_polygon_floorplan.def", lib_->getTech());
+  dbChip* chip = def_parser.createChip(libs,
+                                       DATA_PREFIX
+                                       "data/nangate45_polygon_floorplan.def",
+                                       lib_->getTech());
   EXPECT_NE(chip, nullptr);
 
   // Assert
@@ -70,8 +77,10 @@ TEST_F(Nangate45TestFixture, SettingTheFloorplanTwiceClearsSystemBlockages)
   std::vector<dbLib*> libs = {lib_.get()};
 
   // Act
-  dbChip* chip = def_parser.createChip(
-      libs, "data/nangate45_polygon_floorplan.def", lib_->getTech());
+  dbChip* chip = def_parser.createChip(libs,
+                                       DATA_PREFIX
+                                       "data/nangate45_polygon_floorplan.def",
+                                       lib_->getTech());
   EXPECT_NE(chip, nullptr);
 
   odb::Polygon new_die_area({{0, 0},
@@ -120,8 +129,10 @@ TEST_F(Nangate45TestFixture, DeletingSystemBlockagesThrows)
   std::vector<dbLib*> libs = {lib_.get()};
 
   // Act
-  dbChip* chip = def_parser.createChip(
-      libs, "data/nangate45_polygon_floorplan.def", lib_->getTech());
+  dbChip* chip = def_parser.createChip(libs,
+                                       DATA_PREFIX
+                                       "data/nangate45_polygon_floorplan.def",
+                                       lib_->getTech());
   EXPECT_NE(chip, nullptr);
   dbBlock* block = chip->getBlock();
 
@@ -149,8 +160,10 @@ TEST_F(Nangate45TestFixture, DeletingSystemObstructionsThrows)
   std::vector<dbLib*> libs = {lib_.get()};
 
   // Act
-  dbChip* chip = def_parser.createChip(
-      libs, "data/nangate45_polygon_floorplan.def", lib_->getTech());
+  dbChip* chip = def_parser.createChip(libs,
+                                       DATA_PREFIX
+                                       "data/nangate45_polygon_floorplan.def",
+                                       lib_->getTech());
   EXPECT_NE(chip, nullptr);
   dbBlock* block = chip->getBlock();
   // Assert

src/odb/test/cpp/nangate45_test_fixture.h

@@ -11,6 +11,11 @@
 #include "odb/lefin.h"
 #include "utl/Logger.h"
 
+// TODO: not needed after fully switching to bazel
+#ifndef DATA_PREFIX
+#define DATA_PREFIX ""
+#endif
+
 namespace odb {
 class Nangate45TestFixture : public ::testing::Test
 {
@@ -26,7 +31,8 @@ class Nangate45TestFixture : public ::testing::Test
     odb::lefin lef_reader(
         db_.get(), &logger_, /*ignore_non_routing_layers=*/false);
     lib_ = OdbUniquePtr<odb::dbLib>(
-        lef_reader.createTechAndLib("ng45", "ng45", "Nangate45/Nangate45.lef"),
+        lef_reader.createTechAndLib(
+            "ng45", "ng45", DATA_PREFIX "Nangate45/Nangate45.lef"),
         &odb::dbLib::destroy);
   }