Relocate tests topologies

irobot-ros · Sep 14, 2023 · 5530b70 · 5530b70
1 parent 2063fea
commit 5530b70
Show file tree

Hide file tree

Showing 48 changed files with 24 additions and 31 deletions.
diff --git a/irobot_benchmark/CMakeLists.txt b/irobot_benchmark/CMakeLists.txt
@@ -24,23 +24,33 @@ install(TARGETS
   DESTINATION lib/${PROJECT_NAME}
 )
 
-set(TOPOLOGY_FILES
-  topology/sierra_nevada.json
-  topology/cedar.json
-  topology/mont_blanc.json
-  topology/white_mountain.json
-  topology/debug_sierra_nevada_reliable.json
-  topology/debug_sierra_nevada_best_effort.json
-  topology/debug_mont_blanc_reliable.json
-  topology/debug_mont_blanc_best_effort.json
-  topology/debug_white_mountain_best_effort.json
+set(FT topology/full_topologies)
+
+set(TEST_TOPOLOGY_FILES
+  ${FT}/cedar.json
+  ${FT}/debug_mont_blanc_best_effort.json
+  ${FT}/debug_mont_blanc_reliable.json
+  ${FT}/debug_sierra_nevada_best_effort.json
+  ${FT}/debug_sierra_nevada_reliable.json
+  ${FT}/debug_white_mountain_best_effort.json
+  ${FT}/mont_blanc.json
+  ${FT}/sierra_nevada.json
+  ${FT}/sierra_nevada_fixed_size.json
+  ${FT}/sierra_nevada_fixed_size_debug.json
+  ${FT}/sierra_nevada_fixed_size_loaned.json
+  ${FT}/sierra_nevada_loaned.json
+  ${FT}/white_mountain.json
+  ${FT}/white_mountain_fixed_size.json
+  ${FT}/white_mountain_fixed_size_debug.json
+  ${FT}/white_mountain_fixed_size_loaned.json
+  ${FT}/white_mountain_loaned.json
 )
 
 install(FILES
-  ${TOPOLOGY_FILES}
-  DESTINATION lib/${PROJECT_NAME}/topology)
+  ${TEST_TOPOLOGY_FILES}
+  DESTINATION lib/${PROJECT_NAME}/${FT})
 
-set(SP topology/tests/single_process)
+set(SP topology/single_process)
 
 set(TOPOLOGY_FILES_SINGLE_PROCESS
   ${SP}/pub_sub_loaned_10b.json
@@ -63,7 +73,7 @@ install(FILES
   ${TOPOLOGY_FILES_SINGLE_PROCESS}
   DESTINATION lib/${PROJECT_NAME}/${SP})
 
-set(MP topology/tests/multi_process)
+set(MP topology/multi_process)
 
 set(TOPOLOGY_FILES_MULTI_PROCESS
   ${MP}/pub_ipc_off_10b.json
@@ -91,23 +101,6 @@ install(FILES
   ${TOPOLOGY_FILES_MULTI_PROCESS}
   DESTINATION lib/${PROJECT_NAME}/${MP})
 
-set(FT topology/tests/full_topologies)
-
-set(TEST_TOPOLOGY_FILES
-  ${FT}/sierra_nevada_fixed_size_debug.json
-  ${FT}/sierra_nevada_fixed_size.json
-  ${FT}/sierra_nevada_fixed_size_loaned.json
-  ${FT}/sierra_nevada_loaned.json
-  ${FT}/white_mountain_fixed_size_debug.json
-  ${FT}/white_mountain_fixed_size.json
-  ${FT}/white_mountain_fixed_size_loaned.json
-  ${FT}/white_mountain_loaned.json
-)
-
-install(FILES
-  ${TEST_TOPOLOGY_FILES}
-  DESTINATION lib/${PROJECT_NAME}/${FT})
-
 set(PROFILES
   profiles/fastdds_settings_shm.xml
   profiles/ignore_local_endpoints.xml)

diff --git a/irobot_benchmark/topology/cedar.json → ...hmark/topology/full_topologies/cedar.json b/irobot_benchmark/topology/cedar.json → ...hmark/topology/full_topologies/cedar.json
diff --git a/...opology/debug_mont_blanc_best_effort.json → ...ologies/debug_mont_blanc_best_effort.json b/...opology/debug_mont_blanc_best_effort.json → ...ologies/debug_mont_blanc_best_effort.json
diff --git a/...k/topology/debug_mont_blanc_reliable.json → ...topologies/debug_mont_blanc_reliable.json b/...k/topology/debug_mont_blanc_reliable.json → ...topologies/debug_mont_blanc_reliable.json
diff --git a/...logy/debug_sierra_nevada_best_effort.json → ...gies/debug_sierra_nevada_best_effort.json b/...logy/debug_sierra_nevada_best_effort.json → ...gies/debug_sierra_nevada_best_effort.json
diff --git a/...opology/debug_sierra_nevada_reliable.json → ...ologies/debug_sierra_nevada_reliable.json b/...opology/debug_sierra_nevada_reliable.json → ...ologies/debug_sierra_nevada_reliable.json
diff --git a/...ogy/debug_white_mountain_best_effort.json → ...ies/debug_white_mountain_best_effort.json b/...ogy/debug_white_mountain_best_effort.json → ...ies/debug_white_mountain_best_effort.json
diff --git a/irobot_benchmark/topology/mont_blanc.json → .../topology/full_topologies/mont_blanc.json b/irobot_benchmark/topology/mont_blanc.json → .../topology/full_topologies/mont_blanc.json
diff --git a/irobot_benchmark/topology/mont_blanc.pdf → ...k/topology/full_topologies/mont_blanc.pdf b/irobot_benchmark/topology/mont_blanc.pdf → ...k/topology/full_topologies/mont_blanc.pdf
diff --git a/irobot_benchmark/topology/sierra_nevada.json → ...pology/full_topologies/sierra_nevada.json b/irobot_benchmark/topology/sierra_nevada.json → ...pology/full_topologies/sierra_nevada.json
diff --git a/irobot_benchmark/topology/sierra_nevada.pdf → ...opology/full_topologies/sierra_nevada.pdf b/irobot_benchmark/topology/sierra_nevada.pdf → ...opology/full_topologies/sierra_nevada.pdf
diff --git a/..._topologies/sierra_nevada_fixed_size.json → ..._topologies/sierra_nevada_fixed_size.json b/..._topologies/sierra_nevada_fixed_size.json → ..._topologies/sierra_nevada_fixed_size.json
diff --git a/...ogies/sierra_nevada_fixed_size_debug.json → ...ogies/sierra_nevada_fixed_size_debug.json b/...ogies/sierra_nevada_fixed_size_debug.json → ...ogies/sierra_nevada_fixed_size_debug.json
diff --git a/...gies/sierra_nevada_fixed_size_loaned.json → ...gies/sierra_nevada_fixed_size_loaned.json b/...gies/sierra_nevada_fixed_size_loaned.json → ...gies/sierra_nevada_fixed_size_loaned.json
diff --git a/...full_topologies/sierra_nevada_loaned.json → ...full_topologies/sierra_nevada_loaned.json b/...full_topologies/sierra_nevada_loaned.json → ...full_topologies/sierra_nevada_loaned.json
diff --git a/...ot_benchmark/topology/white_mountain.json → ...ology/full_topologies/white_mountain.json b/...ot_benchmark/topology/white_mountain.json → ...ology/full_topologies/white_mountain.json
diff --git a/...topologies/white_mountain_fixed_size.json → ...topologies/white_mountain_fixed_size.json b/...topologies/white_mountain_fixed_size.json → ...topologies/white_mountain_fixed_size.json
diff --git a/...gies/white_mountain_fixed_size_debug.json → ...gies/white_mountain_fixed_size_debug.json b/...gies/white_mountain_fixed_size_debug.json → ...gies/white_mountain_fixed_size_debug.json
diff --git a/...ies/white_mountain_fixed_size_loaned.json → ...ies/white_mountain_fixed_size_loaned.json b/...ies/white_mountain_fixed_size_loaned.json → ...ies/white_mountain_fixed_size_loaned.json
diff --git a/...ull_topologies/white_mountain_loaned.json → ...ull_topologies/white_mountain_loaned.json b/...ull_topologies/white_mountain_loaned.json → ...ull_topologies/white_mountain_loaned.json
diff --git a/...ests/multi_process/pub_ipc_off_100kb.json → ...logy/multi_process/pub_ipc_off_100kb.json b/...ests/multi_process/pub_ipc_off_100kb.json → ...logy/multi_process/pub_ipc_off_100kb.json
diff --git a/.../tests/multi_process/pub_ipc_off_10b.json → ...pology/multi_process/pub_ipc_off_10b.json b/.../tests/multi_process/pub_ipc_off_10b.json → ...pology/multi_process/pub_ipc_off_10b.json
diff --git a/.../tests/multi_process/pub_ipc_off_1mb.json → ...pology/multi_process/pub_ipc_off_1mb.json b/.../tests/multi_process/pub_ipc_off_1mb.json → ...pology/multi_process/pub_ipc_off_1mb.json
diff --git a/.../tests/multi_process/pub_ipc_off_4mb.json → ...pology/multi_process/pub_ipc_off_4mb.json b/.../tests/multi_process/pub_ipc_off_4mb.json → ...pology/multi_process/pub_ipc_off_4mb.json
diff --git a/...tests/multi_process/pub_loaned_100kb.json → ...ology/multi_process/pub_loaned_100kb.json b/...tests/multi_process/pub_loaned_100kb.json → ...ology/multi_process/pub_loaned_100kb.json
diff --git a/...y/tests/multi_process/pub_loaned_10b.json → ...opology/multi_process/pub_loaned_10b.json b/...y/tests/multi_process/pub_loaned_10b.json → ...opology/multi_process/pub_loaned_10b.json
diff --git a/...y/tests/multi_process/pub_loaned_1mb.json → ...opology/multi_process/pub_loaned_1mb.json b/...y/tests/multi_process/pub_loaned_1mb.json → ...opology/multi_process/pub_loaned_1mb.json
diff --git a/...y/tests/multi_process/pub_loaned_4mb.json → ...opology/multi_process/pub_loaned_4mb.json b/...y/tests/multi_process/pub_loaned_4mb.json → ...opology/multi_process/pub_loaned_4mb.json
diff --git a/...ests/multi_process/sub_ipc_off_100kb.json → ...logy/multi_process/sub_ipc_off_100kb.json b/...ests/multi_process/sub_ipc_off_100kb.json → ...logy/multi_process/sub_ipc_off_100kb.json
diff --git a/.../tests/multi_process/sub_ipc_off_10b.json → ...pology/multi_process/sub_ipc_off_10b.json b/.../tests/multi_process/sub_ipc_off_10b.json → ...pology/multi_process/sub_ipc_off_10b.json
diff --git a/.../tests/multi_process/sub_ipc_off_1mb.json → ...pology/multi_process/sub_ipc_off_1mb.json b/.../tests/multi_process/sub_ipc_off_1mb.json → ...pology/multi_process/sub_ipc_off_1mb.json
diff --git a/.../tests/multi_process/sub_ipc_off_4mb.json → ...pology/multi_process/sub_ipc_off_4mb.json b/.../tests/multi_process/sub_ipc_off_4mb.json → ...pology/multi_process/sub_ipc_off_4mb.json
diff --git a/...tests/multi_process/sub_loaned_100kb.json → ...ology/multi_process/sub_loaned_100kb.json b/...tests/multi_process/sub_loaned_100kb.json → ...ology/multi_process/sub_loaned_100kb.json
diff --git a/...y/tests/multi_process/sub_loaned_10b.json → ...opology/multi_process/sub_loaned_10b.json b/...y/tests/multi_process/sub_loaned_10b.json → ...opology/multi_process/sub_loaned_10b.json
diff --git a/...y/tests/multi_process/sub_loaned_1mb.json → ...opology/multi_process/sub_loaned_1mb.json b/...y/tests/multi_process/sub_loaned_1mb.json → ...opology/multi_process/sub_loaned_1mb.json
diff --git a/...y/tests/multi_process/sub_loaned_4mb.json → ...opology/multi_process/sub_loaned_4mb.json b/...y/tests/multi_process/sub_loaned_4mb.json → ...opology/multi_process/sub_loaned_4mb.json
diff --git a/...single_process/pub_sub_100kb_ipc_off.json → ...single_process/pub_sub_100kb_ipc_off.json b/...single_process/pub_sub_100kb_ipc_off.json → ...single_process/pub_sub_100kb_ipc_off.json
diff --git a/.../single_process/pub_sub_100kb_ipc_on.json → .../single_process/pub_sub_100kb_ipc_on.json b/.../single_process/pub_sub_100kb_ipc_on.json → .../single_process/pub_sub_100kb_ipc_on.json
diff --git a/...s/single_process/pub_sub_10b_ipc_off.json → ...y/single_process/pub_sub_10b_ipc_off.json b/...s/single_process/pub_sub_10b_ipc_off.json → ...y/single_process/pub_sub_10b_ipc_off.json
diff --git a/...ts/single_process/pub_sub_10b_ipc_on.json → ...gy/single_process/pub_sub_10b_ipc_on.json b/...ts/single_process/pub_sub_10b_ipc_on.json → ...gy/single_process/pub_sub_10b_ipc_on.json
diff --git a/...s/single_process/pub_sub_1mb_ipc_off.json → ...y/single_process/pub_sub_1mb_ipc_off.json b/...s/single_process/pub_sub_1mb_ipc_off.json → ...y/single_process/pub_sub_1mb_ipc_off.json
diff --git a/...ts/single_process/pub_sub_1mb_ipc_on.json → ...gy/single_process/pub_sub_1mb_ipc_on.json b/...ts/single_process/pub_sub_1mb_ipc_on.json → ...gy/single_process/pub_sub_1mb_ipc_on.json
diff --git a/...s/single_process/pub_sub_4mb_ipc_off.json → ...y/single_process/pub_sub_4mb_ipc_off.json b/...s/single_process/pub_sub_4mb_ipc_off.json → ...y/single_process/pub_sub_4mb_ipc_off.json
diff --git a/...ts/single_process/pub_sub_4mb_ipc_on.json → ...gy/single_process/pub_sub_4mb_ipc_on.json b/...ts/single_process/pub_sub_4mb_ipc_on.json → ...gy/single_process/pub_sub_4mb_ipc_on.json
diff --git a/.../single_process/pub_sub_loaned_100kb.json → .../single_process/pub_sub_loaned_100kb.json b/.../single_process/pub_sub_loaned_100kb.json → .../single_process/pub_sub_loaned_100kb.json
diff --git a/...ts/single_process/pub_sub_loaned_10b.json → ...gy/single_process/pub_sub_loaned_10b.json b/...ts/single_process/pub_sub_loaned_10b.json → ...gy/single_process/pub_sub_loaned_10b.json
diff --git a/...ts/single_process/pub_sub_loaned_1mb.json → ...gy/single_process/pub_sub_loaned_1mb.json b/...ts/single_process/pub_sub_loaned_1mb.json → ...gy/single_process/pub_sub_loaned_1mb.json
diff --git a/...ts/single_process/pub_sub_loaned_4mb.json → ...gy/single_process/pub_sub_loaned_4mb.json b/...ts/single_process/pub_sub_loaned_4mb.json → ...gy/single_process/pub_sub_loaned_4mb.json