From 5bb98187fcbf6e5ad8e1500b95c8bdcf38a8a7eb Mon Sep 17 00:00:00 2001
From: Geza Lore <gezalore@gmail.com>
Date: Thu, 11 Dec 2025 15:23:03 +0000
Subject: [PATCH] Tests: Fix t_vpi_hierarchy_clear on macOS (#6793)

---
 test_regress/t/TestVpi.h                 | 4 ++++
 test_regress/t/t_time_vpi_c.cpp          | 4 ----
 test_regress/t/t_vpi_cb_iter.cpp         | 4 ----
 test_regress/t/t_vpi_const_type.cpp      | 4 ----
 test_regress/t/t_vpi_dump.cpp            | 4 ----
 test_regress/t/t_vpi_escape.cpp          | 4 ----
 test_regress/t/t_vpi_get.cpp             | 4 ----
 test_regress/t/t_vpi_get_value_array.cpp | 4 ----
 test_regress/t/t_vpi_memory.cpp          | 4 ----
 test_regress/t/t_vpi_module.cpp          | 4 ----
 test_regress/t/t_vpi_module_empty.cpp    | 4 ----
 test_regress/t/t_vpi_multidim.cpp        | 4 ----
 test_regress/t/t_vpi_onetime_cbs.cpp     | 4 ----
 test_regress/t/t_vpi_package.cpp         | 4 ----
 test_regress/t/t_vpi_param.cpp           | 4 ----
 test_regress/t/t_vpi_public_depth.cpp    | 4 ----
 test_regress/t/t_vpi_put_value_array.cpp | 4 ----
 test_regress/t/t_vpi_repetitive_cbs.cpp  | 4 ----
 test_regress/t/t_vpi_time_cb_c.cpp       | 4 ----
 test_regress/t/t_vpi_unimpl.cpp          | 4 ----
 test_regress/t/t_vpi_var.cpp             | 4 ----
 test_regress/t/t_vpi_zero_time_cb.cpp    | 4 ----
 22 files changed, 4 insertions(+), 84 deletions(-)

diff --git a/test_regress/t/TestVpi.h b/test_regress/t/TestVpi.h
index 98a4c548a..3cc7e678c 100644
--- a/test_regress/t/TestVpi.h
+++ b/test_regress/t/TestVpi.h
@@ -14,6 +14,10 @@
 
 #include <iostream>
 
+extern "C" {
+#include <libgen.h>
+}
+
 // Avoid C++11 in this file as not all simulators allow it
 
 //======================================================================
diff --git a/test_regress/t/t_time_vpi_c.cpp b/test_regress/t/t_time_vpi_c.cpp
index 8063f5bbf..86ab6a5ef 100644
--- a/test_regress/t/t_time_vpi_c.cpp
+++ b/test_regress/t/t_time_vpi_c.cpp
@@ -15,10 +15,6 @@
 #include <cstdio>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_cb_iter.cpp b/test_regress/t/t_vpi_cb_iter.cpp
index b5af77a6f..d98fe968c 100644
--- a/test_regress/t/t_vpi_cb_iter.cpp
+++ b/test_regress/t/t_vpi_cb_iter.cpp
@@ -22,10 +22,6 @@
 #include <iostream>
 #include <vector>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"
diff --git a/test_regress/t/t_vpi_const_type.cpp b/test_regress/t/t_vpi_const_type.cpp
index 04812fb54..5efd97175 100644
--- a/test_regress/t/t_vpi_const_type.cpp
+++ b/test_regress/t/t_vpi_const_type.cpp
@@ -31,10 +31,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_dump.cpp b/test_regress/t/t_vpi_dump.cpp
index b3c7a7c3c..cf2147e54 100644
--- a/test_regress/t/t_vpi_dump.cpp
+++ b/test_regress/t/t_vpi_dump.cpp
@@ -14,10 +14,6 @@
 
 #include <cstdio>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"
diff --git a/test_regress/t/t_vpi_escape.cpp b/test_regress/t/t_vpi_escape.cpp
index 724ae85ee..03f206e88 100644
--- a/test_regress/t/t_vpi_escape.cpp
+++ b/test_regress/t/t_vpi_escape.cpp
@@ -27,10 +27,6 @@
 
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"
diff --git a/test_regress/t/t_vpi_get.cpp b/test_regress/t/t_vpi_get.cpp
index a3a802514..7a9e5711f 100644
--- a/test_regress/t/t_vpi_get.cpp
+++ b/test_regress/t/t_vpi_get.cpp
@@ -31,10 +31,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_get_value_array.cpp b/test_regress/t/t_vpi_get_value_array.cpp
index c1f3bcc5e..621d1ac62 100644
--- a/test_regress/t/t_vpi_get_value_array.cpp
+++ b/test_regress/t/t_vpi_get_value_array.cpp
@@ -18,10 +18,6 @@
 
 #endif
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_memory.cpp b/test_regress/t/t_vpi_memory.cpp
index c0268c4ab..857ee2d90 100644
--- a/test_regress/t/t_vpi_memory.cpp
+++ b/test_regress/t/t_vpi_memory.cpp
@@ -31,10 +31,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"
diff --git a/test_regress/t/t_vpi_module.cpp b/test_regress/t/t_vpi_module.cpp
index 886487fa7..a0a3c030f 100644
--- a/test_regress/t/t_vpi_module.cpp
+++ b/test_regress/t/t_vpi_module.cpp
@@ -31,10 +31,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_module_empty.cpp b/test_regress/t/t_vpi_module_empty.cpp
index dd79c521a..f08ebb27d 100644
--- a/test_regress/t/t_vpi_module_empty.cpp
+++ b/test_regress/t/t_vpi_module_empty.cpp
@@ -31,10 +31,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_multidim.cpp b/test_regress/t/t_vpi_multidim.cpp
index 016054d6c..848c5bc7c 100644
--- a/test_regress/t/t_vpi_multidim.cpp
+++ b/test_regress/t/t_vpi_multidim.cpp
@@ -35,10 +35,6 @@
 #include <iostream>
 #include <random>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"
diff --git a/test_regress/t/t_vpi_onetime_cbs.cpp b/test_regress/t/t_vpi_onetime_cbs.cpp
index c9945ab9c..b41bed563 100644
--- a/test_regress/t/t_vpi_onetime_cbs.cpp
+++ b/test_regress/t/t_vpi_onetime_cbs.cpp
@@ -27,10 +27,6 @@
 
 #endif
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_package.cpp b/test_regress/t/t_vpi_package.cpp
index 93360131f..c36b28f1e 100644
--- a/test_regress/t/t_vpi_package.cpp
+++ b/test_regress/t/t_vpi_package.cpp
@@ -31,10 +31,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_param.cpp b/test_regress/t/t_vpi_param.cpp
index 9ce832fbd..d5700b10a 100644
--- a/test_regress/t/t_vpi_param.cpp
+++ b/test_regress/t/t_vpi_param.cpp
@@ -38,10 +38,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_public_depth.cpp b/test_regress/t/t_vpi_public_depth.cpp
index 4d9b9971b..e1bf6e2a6 100644
--- a/test_regress/t/t_vpi_public_depth.cpp
+++ b/test_regress/t/t_vpi_public_depth.cpp
@@ -39,10 +39,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_put_value_array.cpp b/test_regress/t/t_vpi_put_value_array.cpp
index 6e6294267..b8f8c65a7 100644
--- a/test_regress/t/t_vpi_put_value_array.cpp
+++ b/test_regress/t/t_vpi_put_value_array.cpp
@@ -18,10 +18,6 @@
 
 #endif
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_repetitive_cbs.cpp b/test_regress/t/t_vpi_repetitive_cbs.cpp
index 107a77629..1ed4e48f6 100644
--- a/test_regress/t/t_vpi_repetitive_cbs.cpp
+++ b/test_regress/t/t_vpi_repetitive_cbs.cpp
@@ -29,10 +29,6 @@
 #include <iostream>
 #include <vector>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestSimulator.h"
 #include "TestVpi.h"
diff --git a/test_regress/t/t_vpi_time_cb_c.cpp b/test_regress/t/t_vpi_time_cb_c.cpp
index 00e50b5fe..4f69d232c 100644
--- a/test_regress/t/t_vpi_time_cb_c.cpp
+++ b/test_regress/t/t_vpi_time_cb_c.cpp
@@ -16,10 +16,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"
diff --git a/test_regress/t/t_vpi_unimpl.cpp b/test_regress/t/t_vpi_unimpl.cpp
index fa6f5291f..732b30d53 100644
--- a/test_regress/t/t_vpi_unimpl.cpp
+++ b/test_regress/t/t_vpi_unimpl.cpp
@@ -19,10 +19,6 @@
 
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestVpi.h"
 
diff --git a/test_regress/t/t_vpi_var.cpp b/test_regress/t/t_vpi_var.cpp
index 845012b7e..514551df7 100644
--- a/test_regress/t/t_vpi_var.cpp
+++ b/test_regress/t/t_vpi_var.cpp
@@ -44,10 +44,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"
diff --git a/test_regress/t/t_vpi_zero_time_cb.cpp b/test_regress/t/t_vpi_zero_time_cb.cpp
index fe2d183fa..e19bd7f38 100644
--- a/test_regress/t/t_vpi_zero_time_cb.cpp
+++ b/test_regress/t/t_vpi_zero_time_cb.cpp
@@ -32,10 +32,6 @@
 #include <cstring>
 #include <iostream>
 
-extern "C" {
-#include <libgen.h>
-}
-
 // These require the above. Comment prevents clang-format moving them
 #include "TestCheck.h"
 #include "TestSimulator.h"