test: exercise C++ assertions in Release CI

.github/workflows/ci.yml

@@ -131,10 +131,10 @@ jobs:
           name: ${{ matrix.os }}-appdir
           path: AppDir
 
-      - name: Unit test (test_picker_utils)
+      - name: C++ unit tests
         run: |
-          cmake --build build --target test_picker_utils -j"$(nproc)"
-          ./build/bin/test_picker_utils
+          cmake --build build --parallel "$(nproc)"
+          ctest --test-dir build --output-on-failure --parallel "$(nproc)"
 
       - name: Smoke tests
         run: |

test/CMakeLists.txt

@@ -1,5 +1,14 @@
 include_directories(../include)
 
+# Picker's Release builds define NDEBUG, while these tests use standard
+# assert() for their checks. Keep the optimized build but make test assertions
+# evaluate in every configuration.
+if(MSVC)
+    add_compile_options(/UNDEBUG)
+else()
+    add_compile_options(-UNDEBUG)
+endif()
+
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 include(parser_internalcfg)

test/test_codegen_filelist.cpp

@@ -155,7 +155,9 @@ int main()
 
     assert(stderr_output.empty());
     assert(incdirs3.size() == 1);
-    assert(incdirs3.front() == base.string());
+    // Some standard libraries preserve a trailing separator for "base/.", so
+    // compare the existing directories rather than their spellings.
+    assert(fs::equivalent(fs::path(incdirs3.front()), base));
     assert(contains_line(ofilelist3, (base / "rtl1.sv").string()));
     assert(!contains_line(ofilelist3, (cwd_base / "rtl1.sv").string()));
 

test/test_parser_internalcfg_unit.cpp

@@ -32,6 +32,7 @@ int main()
     assert(pins.size() == 3);
 
     bool found_a = false, found_b = false, found_c = false;
+    // Mapping keys are hierarchy components, including a scalar leaf's key.
     for (const auto &p : pins) {
         if (p.logic_pin == "top.sub.a") {
             found_a = true;
@@ -42,7 +43,7 @@ int main()
             found_b = true;
             assert(p.logic_pin_type == "output");
             assert(p.logic_pin_hb == -1);
-        } else if (p.logic_pin == "top.sub2.c") {
+        } else if (p.logic_pin == "top.sub2.key.c") {
             found_c = true;
             assert(p.logic_pin_type == "inout");
             assert(p.logic_pin_hb == 7);

test/test_picker_utils.cpp

@@ -13,6 +13,10 @@ static void write_text(const std::string &p, const std::string &t) {
   o << t;
 }
 
+#ifdef NDEBUG
+#error "Picker test targets must be compiled with assertions enabled"
+#endif
+
 int main() {
   // trim/ltrim/rtrim and trim with custom pattern
   assert(picker::ltrim(string("  hi")) == "hi");