move tests to tests/tests (#86)

HEP-SoC · Oct 5, 2024 · 59c59e7 · 59c59e7
1 parent 40fd096
commit 59c59e7
Show file tree

Hide file tree

Showing 64 changed files with 114 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,7 @@ option(SOCMAKE_BUILD_TESTING "Enable SoCMake unit testing" OFF)
 
 if("${SOCMAKE_BUILD_TESTING}")
     include(CTest)
-    add_subdirectory(tests)
+    add_subdirectory(tests/tests)
 endif()
 
 # This is to prevent a warning

diff --git a/tests/tests/CMakeLists.txt b/tests/tests/CMakeLists.txt
@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.25)
+project(SoCMake_testing)
+
+include(CTest)
+
+add_custom_target(check
+    COMMAND ctest $(JOBS) --output-on-failure
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/../../
+    )
+
+add_custom_target(check_cdash
+    COMMAND ctest -D Nightly $(JOBS) --output-on-failure
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/../../
+    )
+
+add_subdirectory(iverilog)
+add_subdirectory(vhier)
+add_subdirectory(peakrdl)
+
+include("getcmaketest.cmake")
+include(cmake_test/cmake_test)
+
+ct_add_dir(add_ip                 USE_REL_PATH_NAMES LABEL)
+ct_add_dir(ip_include_directories USE_REL_PATH_NAMES LABEL)
+ct_add_dir(ip_compile_definitions USE_REL_PATH_NAMES LABEL)
+ct_add_dir(alias_dereference      USE_REL_PATH_NAMES LABEL)
+ct_add_dir(check_languages        USE_REL_PATH_NAMES LABEL)
+ct_add_dir(ip_sources             USE_REL_PATH_NAMES LABEL)
+ct_add_dir(ip_link                USE_REL_PATH_NAMES LABEL)
diff --git a/tests/add_ip/add_ip.cmake → tests/tests/add_ip/add_ip.cmake b/tests/add_ip/add_ip.cmake → tests/tests/add_ip/add_ip.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME add_ip)
 

diff --git a/tests/add_ip/add_ip_1_token.cmake → tests/tests/add_ip/add_ip_1_token.cmake b/tests/add_ip/add_ip_1_token.cmake → tests/tests/add_ip/add_ip_1_token.cmake
@@ -1,5 +1,5 @@
 # This test will succed because its allowed to have short notation in `ip_link(ip)` call
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME add_ip_1_token)
 

diff --git a/tests/add_ip/add_ip_description.cmake → tests/tests/add_ip/add_ip_description.cmake b/tests/add_ip/add_ip_description.cmake → tests/tests/add_ip/add_ip_description.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME add_ip_description)
 

diff --git a/tests/add_ip/add_ip_fail_2_tokens.cmake → ...s/tests/add_ip/add_ip_fail_2_tokens.cmake b/tests/add_ip/add_ip_fail_2_tokens.cmake → ...s/tests/add_ip/add_ip_fail_2_tokens.cmake
@@ -1,5 +1,5 @@
 # This tests should fail because its not allowed to have different than 4 or 1 tokens in `ip_link()` call
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME add_ip_fail_2_tokens_name_version)
 ct_add_test(NAME ${TEST_NAME} EXPECTFAIL)

diff --git a/tests/add_ip/add_ip_fail_3_tokens.cmake → ...s/tests/add_ip/add_ip_fail_3_tokens.cmake b/tests/add_ip/add_ip_fail_3_tokens.cmake → ...s/tests/add_ip/add_ip_fail_3_tokens.cmake
@@ -1,5 +1,5 @@
 # This tests should fail because its not allowed to have different than 4 or 1 tokens in `ip_link()` call
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME add_ip_fail_3_tokens_vendor_lib_ip)
 ct_add_test(NAME ${TEST_NAME} EXPECTFAIL)

diff --git a/tests/add_ip/add_ip_fail_4_tokens.cmake → ...s/tests/add_ip/add_ip_fail_4_tokens.cmake b/tests/add_ip/add_ip_fail_4_tokens.cmake → ...s/tests/add_ip/add_ip_fail_4_tokens.cmake
@@ -1,5 +1,5 @@
 # This tests should fail because its not allowed to have different than 4 or 1 tokens in `ip_link()` call
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME add_ip_fail_4_tokens_empty_token_1)
 ct_add_test(NAME ${TEST_NAME} EXPECTFAIL)

diff --git a/.../add_ip/add_ip_fail_too_many_tokens.cmake → .../add_ip/add_ip_fail_too_many_tokens.cmake b/.../add_ip/add_ip_fail_too_many_tokens.cmake → .../add_ip/add_ip_fail_too_many_tokens.cmake
@@ -1,5 +1,5 @@
 # This tests should fail because its not allowed to have different than 4 or 1 tokens in `ip_link()` call
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME add_ip_fail_5_tokens)
 ct_add_test(NAME ${TEST_NAME} EXPECTFAIL)

diff --git a/...alias_dereference/alias_dereference.cmake → ...alias_dereference/alias_dereference.cmake b/...alias_dereference/alias_dereference.cmake → ...alias_dereference/alias_dereference.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME alias_dereference)
 

diff --git a/...anguages/check_languages_additional.cmake → ...anguages/check_languages_additional.cmake b/...anguages/check_languages_additional.cmake → ...anguages/check_languages_additional.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME check_languages_additional)
 

diff --git a/...eck_languages/check_languages_fatal.cmake → ...eck_languages/check_languages_fatal.cmake b/...eck_languages/check_languages_fatal.cmake → ...eck_languages/check_languages_fatal.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME check_languages_fatal)
 

diff --git a/..._languages/check_languages_standard.cmake → ..._languages/check_languages_standard.cmake b/..._languages/check_languages_standard.cmake → ..._languages/check_languages_standard.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME check_languages_standard)
 

diff --git a/...k_languages/check_languages_warning.cmake → ...k_languages/check_languages_warning.cmake b/...k_languages/check_languages_warning.cmake → ...k_languages/check_languages_warning.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME check_languages_warning)
 

diff --git a/tests/tests/getcmaketest.cmake b/tests/tests/getcmaketest.cmake
@@ -0,0 +1,46 @@
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_BINARY_DIR}/_deps/cmakepp_lang-src/cmake)
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_BINARY_DIR}/_deps/cmake_test-src/cmake)
+include_guard()
+
+#[[[
+# This function encapsulates the process of getting CMakeTest using CMake's
+# FetchContent module. We have encapsulated it in a function so we can set
+# the options for its configure step without affecting the options for the
+# parent project's configure step (namely we do not want to build CMakeTest's
+# unit tests).
+#]]
+macro(get_cmake_test)
+    include(cmake_test/cmake_test OPTIONAL RESULT_VARIABLE cmake_test_found)
+    if(NOT cmake_test_found)
+
+
+
+        # Store whether we are building tests or not, then turn off the tests
+        set(build_testing_old "${BUILD_TESTING}")
+        set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
+        # Download CMakeTest and bring it into scope
+        include(FetchContent)
+        FetchContent_Declare(
+             cmake_test
+             GIT_REPOSITORY https://github.com/CMakePP/CMakeTest
+             GIT_TAG b07712effc7877c97712a5342a34f49b4e8ee3fb
+       )
+       FetchContent_MakeAvailable(cmake_test)
+
+       # Restore the previous value
+       set(BUILD_TESTING "${build_testing_old}" CACHE BOOL "" FORCE)
+    endif()
+endmacro()
+
+# FetchContent_Declare(
+#    cmakepp_lang
+#    GIT_REPOSITORY https://github.com/CMakePP/CMakePPLang
+# )
+# FetchContent_MakeAvailable(cmakepp_lang)
+# include(cmakepp_lang/cmakepp_lang)
+
+# Call the function we just wrote to get CMakeTest
+get_cmake_test()
+
+# Include CMakeTest
+# include(cmake_test/cmake_test)
diff --git a/..._definitions/ip_compile_definitions.cmake → ..._definitions/ip_compile_definitions.cmake b/..._definitions/ip_compile_definitions.cmake → ..._definitions/ip_compile_definitions.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME ip_compile_definitions)
 

diff --git a/...p_compile_definitions_get_multilang.cmake → ...p_compile_definitions_get_multilang.cmake b/...p_compile_definitions_get_multilang.cmake → ...p_compile_definitions_get_multilang.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME ip_compile_definitions_get_multilang)
 

diff --git a/...nitions/ip_compile_definitions_hier.cmake → ...nitions/ip_compile_definitions_hier.cmake b/...nitions/ip_compile_definitions_hier.cmake → ...nitions/ip_compile_definitions_hier.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME ip_compile_definitions_hier)
 

diff --git a/..._directories/ip_include_directories.cmake → ..._directories/ip_include_directories.cmake b/..._directories/ip_include_directories.cmake → ..._directories/ip_include_directories.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME ip_include_directories)
 

diff --git a/...p_include_directories_get_multilang.cmake → ...p_include_directories_get_multilang.cmake b/...p_include_directories_get_multilang.cmake → ...p_include_directories_get_multilang.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME ip_include_directories_get_multilang)
 

diff --git a/tests/ip_link/ip_link1.cmake → tests/tests/ip_link/ip_link1.cmake b/tests/ip_link/ip_link1.cmake → tests/tests/ip_link/ip_link1.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME ip_link1)
 

diff --git a/...ent_subdir/ip_link_different_subdir.cmake → ...ent_subdir/ip_link_different_subdir.cmake b/...ent_subdir/ip_link_different_subdir.cmake → ...ent_subdir/ip_link_different_subdir.cmake
@@ -4,7 +4,7 @@
 # CMake wraps INTERFACE_LINK_LIBRARIES with ::@(directory-id);...;::@
 # Graph traversal functions should ignore this wrapper
 
-include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../../CMakeLists.txt")
 set(THIS_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 set(TEST_NAME ip_link_different_subdir)

diff --git a/..._link_different_subdir/ips/CMakeLists.txt → ..._link_different_subdir/ips/CMakeLists.txt b/..._link_different_subdir/ips/CMakeLists.txt → ..._link_different_subdir/ips/CMakeLists.txt
diff --git a/...k_different_subdir/ips/ip2/CMakeLists.txt → ...k_different_subdir/ips/ip2/CMakeLists.txt b/...k_different_subdir/ips/ip2/CMakeLists.txt → ...k_different_subdir/ips/ip2/CMakeLists.txt
diff --git a/...k_different_subdir/ips/ip3/CMakeLists.txt → ...k_different_subdir/ips/ip3/CMakeLists.txt b/...k_different_subdir/ips/ip3/CMakeLists.txt → ...k_different_subdir/ips/ip3/CMakeLists.txt
diff --git a/...k_different_subdir/ips/ip4/CMakeLists.txt → ...k_different_subdir/ips/ip4/CMakeLists.txt b/...k_different_subdir/ips/ip4/CMakeLists.txt → ...k_different_subdir/ips/ip4/CMakeLists.txt
diff --git a/tests/ip_link/ip_link_self_link_fatal.cmake → ...sts/ip_link/ip_link_self_link_fatal.cmake b/tests/ip_link/ip_link_self_link_fatal.cmake → ...sts/ip_link/ip_link_self_link_fatal.cmake
@@ -1,5 +1,5 @@
 # This test is expected to throw FATAL_ERROR because `ip_link()` links ip1 to itself
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME ip_link_self_link_fatal)
 

diff --git a/tests/ip_sources/ip_source_fail.cmake → tests/tests/ip_sources/ip_source_fail.cmake b/tests/ip_sources/ip_source_fail.cmake → tests/tests/ip_sources/ip_source_fail.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME ip_sources_fail)
 

diff --git a/tests/ip_sources/ip_sources.cmake → tests/tests/ip_sources/ip_sources.cmake b/tests/ip_sources/ip_sources.cmake → tests/tests/ip_sources/ip_sources.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME ip_sources)
 

diff --git a/...ip_sources/ip_sources_get_multilang.cmake → ...ip_sources/ip_sources_get_multilang.cmake b/...ip_sources/ip_sources_get_multilang.cmake → ...ip_sources/ip_sources_get_multilang.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../CMakeLists.txt")
+include("${CMAKE_CURRENT_LIST_DIR}/../../../CMakeLists.txt")
 
 set(TEST_NAME ip_sources_get_multilang)
 

diff --git a/tests/iverilog/CMakeLists.txt → tests/tests/iverilog/CMakeLists.txt b/tests/iverilog/CMakeLists.txt → tests/tests/iverilog/CMakeLists.txt
diff --git a/...verilog/iverilog_multi_top/CMakeLists.txt → ...verilog/iverilog_multi_top/CMakeLists.txt b/...verilog/iverilog_multi_top/CMakeLists.txt → ...verilog/iverilog_multi_top/CMakeLists.txt
diff --git a/...iverilog/iverilog_multi_top/inc/header.vh → ...iverilog/iverilog_multi_top/inc/header.vh b/...iverilog/iverilog_multi_top/inc/header.vh → ...iverilog/iverilog_multi_top/inc/header.vh
diff --git a/tests/iverilog/iverilog_multi_top/top1.v → .../tests/iverilog/iverilog_multi_top/top1.v b/tests/iverilog/iverilog_multi_top/top1.v → .../tests/iverilog/iverilog_multi_top/top1.v
diff --git a/tests/iverilog/iverilog_multi_top/top2.v → .../tests/iverilog/iverilog_multi_top/top2.v b/tests/iverilog/iverilog_multi_top/top2.v → .../tests/iverilog/iverilog_multi_top/top2.v
diff --git a/...rilog/iverilog_simple_test/CMakeLists.txt → ...rilog/iverilog_simple_test/CMakeLists.txt b/...rilog/iverilog_simple_test/CMakeLists.txt → ...rilog/iverilog_simple_test/CMakeLists.txt
diff --git a/...erilog/iverilog_simple_test/inc/header.vh → ...erilog/iverilog_simple_test/inc/header.vh b/...erilog/iverilog_simple_test/inc/header.vh → ...erilog/iverilog_simple_test/inc/header.vh
diff --git a/tests/iverilog/iverilog_simple_test/tb.v → .../tests/iverilog/iverilog_simple_test/tb.v b/tests/iverilog/iverilog_simple_test/tb.v → .../tests/iverilog/iverilog_simple_test/tb.v
diff --git a/tests/iverilog_multi_top/CMakeLists.txt → ...s/tests/iverilog_multi_top/CMakeLists.txt b/tests/iverilog_multi_top/CMakeLists.txt → ...s/tests/iverilog_multi_top/CMakeLists.txt
diff --git a/tests/iverilog_multi_top/inc/header.vh → tests/tests/iverilog_multi_top/inc/header.vh b/tests/iverilog_multi_top/inc/header.vh → tests/tests/iverilog_multi_top/inc/header.vh
diff --git a/tests/iverilog_multi_top/top1.v → tests/tests/iverilog_multi_top/top1.v b/tests/iverilog_multi_top/top1.v → tests/tests/iverilog_multi_top/top1.v
diff --git a/tests/iverilog_multi_top/top2.v → tests/tests/iverilog_multi_top/top2.v b/tests/iverilog_multi_top/top2.v → tests/tests/iverilog_multi_top/top2.v
diff --git a/tests/iverilog_mutlitop/CMakeLists.txt → tests/tests/iverilog_mutlitop/CMakeLists.txt b/tests/iverilog_mutlitop/CMakeLists.txt → tests/tests/iverilog_mutlitop/CMakeLists.txt
diff --git a/tests/iverilog_simple_test/CMakeLists.txt → ...tests/iverilog_simple_test/CMakeLists.txt b/tests/iverilog_simple_test/CMakeLists.txt → ...tests/iverilog_simple_test/CMakeLists.txt
diff --git a/tests/iverilog_simple_test/inc/header.vh → .../tests/iverilog_simple_test/inc/header.vh b/tests/iverilog_simple_test/inc/header.vh → .../tests/iverilog_simple_test/inc/header.vh
diff --git a/tests/iverilog_simple_test/tb.v → tests/tests/iverilog_simple_test/tb.v b/tests/iverilog_simple_test/tb.v → tests/tests/iverilog_simple_test/tb.v
diff --git a/tests/tests/peakrdl/CMakeLists.txt b/tests/tests/peakrdl/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(print)
diff --git a/tests/tests/peakrdl/ip2.rdl b/tests/tests/peakrdl/ip2.rdl
@@ -0,0 +1,12 @@
+addrmap ip2 {
+    reg {
+        regwidth = 32;
+        field {
+            fieldwidth = 32;
+        } f1;
+    } testreg2;
+
+    `ifdef USE_IP1
+    ip1 ip1_i;
+    `endif
+};
diff --git a/tests/peakrdl/print/CMakeLists.txt → tests/tests/peakrdl/print/CMakeLists.txt b/tests/peakrdl/print/CMakeLists.txt → tests/tests/peakrdl/print/CMakeLists.txt
@@ -1,4 +1,4 @@
-include("../../../SoCMakeConfig.cmake")
+include("../../../../SoCMakeConfig.cmake")
 cmake_minimum_required(VERSION 3.25)
 project(peakrdl_print_test NONE)
 

diff --git a/tests/peakrdl/print/golden.txt → tests/tests/peakrdl/print/golden.txt b/tests/peakrdl/print/golden.txt → tests/tests/peakrdl/print/golden.txt
diff --git a/tests/peakrdl/print/include/udp.rdl → tests/tests/peakrdl/print/include/udp.rdl b/tests/peakrdl/print/include/udp.rdl → tests/tests/peakrdl/print/include/udp.rdl
diff --git a/tests/peakrdl/print/ip1.rdl → tests/tests/peakrdl/print/ip1.rdl b/tests/peakrdl/print/ip1.rdl → tests/tests/peakrdl/print/ip1.rdl
diff --git a/tests/peakrdl/print/ip2.rdl → tests/tests/peakrdl/print/ip2.rdl b/tests/peakrdl/print/ip2.rdl → tests/tests/peakrdl/print/ip2.rdl
diff --git a/tests/peakrdl/print/top.rdl → tests/tests/peakrdl/print/top.rdl b/tests/peakrdl/print/top.rdl → tests/tests/peakrdl/print/top.rdl
diff --git a/tests/peakrdl/print/udp.rdl → tests/tests/peakrdl/print/udp.rdl b/tests/peakrdl/print/udp.rdl → tests/tests/peakrdl/print/udp.rdl
diff --git a/tests/vhier/CMakeLists.txt → tests/tests/vhier/CMakeLists.txt b/tests/vhier/CMakeLists.txt → tests/tests/vhier/CMakeLists.txt
@@ -1,4 +1,4 @@
-include("../../SoCMakeConfig.cmake")
+include("../../../SoCMakeConfig.cmake")
 
 cmake_minimum_required(VERSION 3.25)
 project(vhier_test)

diff --git a/tests/vhier/golden.xml → tests/tests/vhier/golden.xml b/tests/vhier/golden.xml → tests/tests/vhier/golden.xml
diff --git a/tests/vhier/ips/mod1/CMakeLists.txt → tests/tests/vhier/ips/mod1/CMakeLists.txt b/tests/vhier/ips/mod1/CMakeLists.txt → tests/tests/vhier/ips/mod1/CMakeLists.txt
diff --git a/...vhier/ips/mod1/ips/submod1/CMakeLists.txt → ...vhier/ips/mod1/ips/submod1/CMakeLists.txt b/...vhier/ips/mod1/ips/submod1/CMakeLists.txt → ...vhier/ips/mod1/ips/submod1/CMakeLists.txt
diff --git a/...vhier/ips/mod1/ips/submod1/rtl/submod1.sv → ...vhier/ips/mod1/ips/submod1/rtl/submod1.sv b/...vhier/ips/mod1/ips/submod1/rtl/submod1.sv → ...vhier/ips/mod1/ips/submod1/rtl/submod1.sv
diff --git a/...vhier/ips/mod1/ips/submod2/CMakeLists.txt → ...vhier/ips/mod1/ips/submod2/CMakeLists.txt b/...vhier/ips/mod1/ips/submod2/CMakeLists.txt → ...vhier/ips/mod1/ips/submod2/CMakeLists.txt
diff --git a/...vhier/ips/mod1/ips/submod2/rtl/submod2.sv → ...vhier/ips/mod1/ips/submod2/rtl/submod2.sv b/...vhier/ips/mod1/ips/submod2/rtl/submod2.sv → ...vhier/ips/mod1/ips/submod2/rtl/submod2.sv
diff --git a/tests/vhier/ips/mod1/rtl/mod1.sv → tests/tests/vhier/ips/mod1/rtl/mod1.sv b/tests/vhier/ips/mod1/rtl/mod1.sv → tests/tests/vhier/ips/mod1/rtl/mod1.sv
diff --git a/tests/vhier/rtl/top.sv → tests/tests/vhier/rtl/top.sv b/tests/vhier/rtl/top.sv → tests/tests/vhier/rtl/top.sv