From 65e2ca946765f022f055670a9700ce56e3a2e907 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Thu, 4 Dec 2025 21:21:39 -0800 Subject: [PATCH] Refactor top tests --- .../fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/check | 7 ------- .../top/check-cpp-dir/{Commands => commands}/.gitignore | 0 .../test/top/check-cpp-dir/{Commands => commands}/C.hpp | 0 .../{Commands => commands}/CommandsTopologyDefs.hpp | 0 .../check-cpp-dir/{Commands => commands}/NoCommands.hpp | 0 .../test/top/check-cpp-dir/{Health => commands}/check | 2 +- .../test/top/check-cpp-dir/{Commands => commands}/clean | 0 .../test/top/check-cpp-dir/{Health => health}/.gitignore | 0 .../test/top/check-cpp-dir/{Health => health}/C.hpp | 0 .../test/top/check-cpp-dir/{Health => health}/Health.hpp | 0 .../{Health => health}/HealthTopologyDefs.hpp | 0 .../test/top/check-cpp-dir/{Commands => health}/check | 2 +- .../test/top/check-cpp-dir/{Health => health}/clean | 0 .../test/top/check-cpp-dir/{Params => params}/.gitignore | 0 .../test/top/check-cpp-dir/{Params => params}/C.hpp | 0 .../{Params => params}/ParamsTopologyDefs.hpp | 0 .../test/top/check-cpp-dir/{Params => params}/check | 2 +- .../test/top/check-cpp-dir/{Params => params}/clean | 0 .../tools/fpp-to-cpp/test/top/check-cpp-dir/subdirs.txt | 8 ++++---- .../check-cpp-dir/{TlmPackets => tlm_packets}/.gitignore | 0 .../top/check-cpp-dir/{TlmPackets => tlm_packets}/C.hpp | 0 .../NoInstancesTopologyDefs.hpp | 0 .../OneInstanceTopologyDefs.hpp | 0 .../TwoInstancesTopologyDefs.hpp | 0 .../fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/check | 6 ++++++ .../top/check-cpp-dir/{TlmPackets => tlm_packets}/clean | 0 26 files changed, 13 insertions(+), 14 deletions(-) delete mode 100755 compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/check rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Commands => commands}/.gitignore (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Commands => commands}/C.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Commands => commands}/CommandsTopologyDefs.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Commands => commands}/NoCommands.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Health => commands}/check (69%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Commands => commands}/clean (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Health => health}/.gitignore (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Health => health}/C.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Health => health}/Health.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Health => health}/HealthTopologyDefs.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Commands => health}/check (68%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Health => health}/clean (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Params => params}/.gitignore (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Params => params}/C.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Params => params}/ParamsTopologyDefs.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Params => params}/check (63%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{Params => params}/clean (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{TlmPackets => tlm_packets}/.gitignore (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{TlmPackets => tlm_packets}/C.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{TlmPackets => tlm_packets}/NoInstancesTopologyDefs.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{TlmPackets => tlm_packets}/OneInstanceTopologyDefs.hpp (100%) rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{TlmPackets => tlm_packets}/TwoInstancesTopologyDefs.hpp (100%) create mode 100755 compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/check rename compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/{TlmPackets => tlm_packets}/clean (100%) diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/check deleted file mode 100755 index 5325dce64..000000000 --- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/check +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -fpp_to_cpp=../../../../../../bin/fpp-to-cpp -. `dirname $0`/../check_topology.sh - -check_topology tlm_packets - diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/.gitignore similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/.gitignore rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/.gitignore diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/C.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/C.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/C.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/C.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/CommandsTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/CommandsTopologyDefs.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/CommandsTopologyDefs.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/CommandsTopologyDefs.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/NoCommands.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/NoCommands.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/NoCommands.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/NoCommands.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/check similarity index 69% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/check rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/check index f75a3bca3..8f8ae8e35 100755 --- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/check +++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/check @@ -2,4 +2,4 @@ . `dirname $0`/../check_topology.sh -check_topology health +check_topology diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/clean similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/clean rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/commands/clean diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/.gitignore similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/.gitignore rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/.gitignore diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/C.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/C.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/C.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/C.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/Health.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/Health.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/Health.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/Health.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/HealthTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/HealthTopologyDefs.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/HealthTopologyDefs.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/HealthTopologyDefs.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/check similarity index 68% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/check index 3eeb1288f..8f8ae8e35 100755 --- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check +++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/check @@ -2,4 +2,4 @@ . `dirname $0`/../check_topology.sh -check_topology commands +check_topology diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/clean similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/clean rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/health/clean diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/.gitignore similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/.gitignore rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/.gitignore diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/C.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/C.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/C.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/C.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/ParamsTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/ParamsTopologyDefs.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/ParamsTopologyDefs.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/ParamsTopologyDefs.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/check similarity index 63% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/check index 1050ef245..8f8ae8e35 100755 --- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check +++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/check @@ -2,4 +2,4 @@ . `dirname $0`/../check_topology.sh -check_topology params Params +check_topology diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/clean similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/clean rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/params/clean diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/subdirs.txt b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/subdirs.txt index e36106708..b45f8bd83 100644 --- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/subdirs.txt +++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/subdirs.txt @@ -1,8 +1,8 @@ basic -Commands -Health -Params -TlmPackets +commands +health +params +tlm_packets TypedPortsActive TypedPortsPassive TypedPortsQueued diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/.gitignore b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/.gitignore similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/.gitignore rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/.gitignore diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/C.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/C.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/C.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/C.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/NoInstancesTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/NoInstancesTopologyDefs.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/NoInstancesTopologyDefs.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/NoInstancesTopologyDefs.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/OneInstanceTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/OneInstanceTopologyDefs.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/OneInstanceTopologyDefs.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/OneInstanceTopologyDefs.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/TwoInstancesTopologyDefs.hpp b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/TwoInstancesTopologyDefs.hpp similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/TwoInstancesTopologyDefs.hpp rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/TwoInstancesTopologyDefs.hpp diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/check new file mode 100755 index 000000000..3573f8a65 --- /dev/null +++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/check @@ -0,0 +1,6 @@ +#!/bin/sh -e + +. `dirname $0`/../check_topology.sh + +check_topology + diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/clean b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/clean similarity index 100% rename from compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TlmPackets/clean rename to compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/tlm_packets/clean