Revise top test scripts

This commit is contained in:
Rob Bocchino 2025-12-04 18:43:04 -08:00
parent cdbe834ea2
commit a86606c2b6
4 changed files with 15 additions and 9 deletions

View File

@ -2,6 +2,7 @@
export COMPILER_ROOT=`cd ../../../..; pwd` export COMPILER_ROOT=`cd ../../../..; pwd`
export TOP_DIR=$PWD
export FPRIME_DIR=`cd ../fprime; pwd` export FPRIME_DIR=`cd ../fprime; pwd`
export FPRIME_DEPS="$FPRIME_DIR/config/FpConfig.fpp,$FPRIME_DIR/Platform/PlatformTypes.fpp,$FPRIME_DIR/Fw/Prm/Prm.fpp,$FPRIME_DIR/Fw/Cmd/Cmd.fpp" export FPRIME_DEPS="$FPRIME_DIR/config/FpConfig.fpp,$FPRIME_DIR/Platform/PlatformTypes.fpp,$FPRIME_DIR/Fw/Prm/Prm.fpp,$FPRIME_DIR/Fw/Cmd/Cmd.fpp"
export FPRIME_GCC=$COMPILER_ROOT/scripts/fprime-gcc export FPRIME_GCC=$COMPILER_ROOT/scripts/fprime-gcc

View File

@ -1,49 +1,49 @@
basic() basic()
{ {
cd basic cd $TOP_DIR/basic
run_test "-p $PWD -i $FPRIME_DEPS,../phases.fpp,components.fpp -n basic.names.txt" topology && \ run_test "-p $PWD -i $FPRIME_DEPS,../phases.fpp,components.fpp -n basic.names.txt" topology && \
diff -u basic.names.txt basic.names.ref.txt && \ diff -u basic.names.txt basic.names.ref.txt && \
diff_cpp BasicTopology diff_cpp BasicTopology
cd ..
} }
commands() commands()
{ {
cd commands cd $TOP_DIR/commands
run_test "-p $PWD -i $FPRIME_DEPS,../phases.fpp,components.fpp" topology && \ run_test "-p $PWD -i $FPRIME_DEPS,../phases.fpp,components.fpp" topology && \
diff_cpp CommandsTopology diff_cpp CommandsTopology
cd ..
} }
health() health()
{ {
cd health cd $TOP_DIR/health
run_test "-p $PWD -i $FPRIME_DEPS,../phases.fpp,components.fpp" topology && \ run_test "-p $PWD -i $FPRIME_DEPS,../phases.fpp,components.fpp" topology && \
run_test "-i builtin.fpp -p $PWD" health && \
diff_cpp HealthTopology diff_cpp HealthTopology
cd ..
} }
nested_namespaces() nested_namespaces()
{ {
run_test "-p $PWD" nested_namespaces && \ cd $TOP_DIR/nested_namespaces
run_test "-p $PWD -i $FPRIME_DEPS,../phases.fpp,components.fpp" topology && \
diff_cpp NestedNamespacesTopology diff_cpp NestedNamespacesTopology
} }
no_namespace() no_namespace()
{ {
cd $TOP_DIR
run_test "-p $PWD" no_namespace && \ run_test "-p $PWD" no_namespace && \
diff_cpp NoNamespaceTopology diff_cpp NoNamespaceTopology
} }
params() params()
{ {
cd $TOP_DIR
run_test "-i builtin.fpp -p $PWD" params && \ run_test "-i builtin.fpp -p $PWD" params && \
diff_cpp ParamsTopology diff_cpp ParamsTopology
} }
tlm_packets() tlm_packets()
{ {
cd $TOP_DIR
run_test "-i builtin.fpp -p $PWD" tlm_packets && \ run_test "-i builtin.fpp -p $PWD" tlm_packets && \
diff_cpp NoInstancesTopology && \ diff_cpp NoInstancesTopology && \
diff_cpp NoInstances_P1TlmPackets && \ diff_cpp NoInstances_P1TlmPackets && \
@ -58,6 +58,7 @@ tlm_packets()
typed_ports_active() typed_ports_active()
{ {
cd $TOP_DIR
src_dir=$PWD/typed_ports_active src_dir=$PWD/typed_ports_active
run_test "-d $src_dir -p $PWD,$src_dir -i $src_dir/components.fpp" \ run_test "-d $src_dir -p $PWD,$src_dir -i $src_dir/components.fpp" \
$src_dir/topology && \ $src_dir/topology && \
@ -66,6 +67,7 @@ typed_ports_active()
typed_ports_passive() typed_ports_passive()
{ {
cd $TOP_DIR
src_dir=$PWD/typed_ports_passive src_dir=$PWD/typed_ports_passive
run_test "-d $src_dir -p $PWD,$src_dir -i $src_dir/components.fpp" \ run_test "-d $src_dir -p $PWD,$src_dir -i $src_dir/components.fpp" \
$src_dir/topology && \ $src_dir/topology && \
@ -74,6 +76,7 @@ typed_ports_passive()
typed_ports_queued() typed_ports_queued()
{ {
cd $TOP_DIR
src_dir=$PWD/typed_ports_queued src_dir=$PWD/typed_ports_queued
run_test "-d $src_dir -p $PWD,$src_dir -i $src_dir/components.fpp" \ run_test "-d $src_dir -p $PWD,$src_dir -i $src_dir/components.fpp" \
$src_dir/topology && \ $src_dir/topology && \

View File

@ -25,8 +25,10 @@ health()
nested_namespaces() nested_namespaces()
{ {
update "-p $PWD" nested_namespaces cd nested_namespaces
update "-p $PWD -i $FPRIME_DEPS,../phases.fpp,components.fpp" topology
move_cpp NestedNamespacesTopology move_cpp NestedNamespacesTopology
cd ..
} }
no_namespace() no_namespace()