Revise tests for port invocation

compiler/tools/fpp-to-cpp/test/top/TypedPortsPassiveTopologyAc.ref.cpp

@@ -1,10 +1,10 @@
 // ======================================================================
-// \title  TypedPortsTopologyAc.cpp
+// \title  TypedPortsPassiveTopologyAc.cpp
 // \author Generated by fpp-to-cpp
-// \brief  cpp file for TypedPorts topology
+// \brief  cpp file for TypedPortsPassive topology
 // ======================================================================
 
-#include "TypedPortsTopologyAc.hpp"
+#include "TypedPortsPassiveTopologyAc.hpp"
 
 // ----------------------------------------------------------------------
 // Component instances

compiler/tools/fpp-to-cpp/test/top/TypedPortsPassiveTopologyAc.ref.hpp

@@ -1,15 +1,15 @@
 // ======================================================================
-// \title  TypedPortsTopologyAc.hpp
+// \title  TypedPortsPassiveTopologyAc.hpp
 // \author Generated by fpp-to-cpp
-// \brief  hpp file for TypedPorts topology
+// \brief  hpp file for TypedPortsPassive topology
 // ======================================================================
 
-#ifndef M_TypedPortsTopologyAc_HPP
-#define M_TypedPortsTopologyAc_HPP
+#ifndef M_TypedPortsPassiveTopologyAc_HPP
+#define M_TypedPortsPassiveTopologyAc_HPP
 
 #include "PassiveReceiver.hpp"
 #include "PassiveSender.hpp"
-#include "TypedPortsTopologyDefs.hpp"
+#include "TypedPortsPassiveTopologyDefs.hpp"
 
 // ----------------------------------------------------------------------
 // Component instances

compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/TypedPortsPassive/check

@@ -9,11 +9,11 @@ echo '  removing old files'
 dir=`cd ../..; echo $PWD`
 
 echo '  generating C++'
-$fpp_to_cpp -p $dir ../../typed_ports.fpp
+$fpp_to_cpp -p $dir ../../typed_ports_passive.fpp
 
 for suffix in hpp cpp
 do
-  cp ../../TypedPortsTopologyAc.ref.$suffix TypedPortsTopologyAc.$suffix
+  cp ../../TypedPortsPassiveTopologyAc.ref.$suffix TypedPortsPassiveTopologyAc.$suffix
 done
 
 flags="-I.. -I../../../fprime -I../../../fprime/config -Wno-unused-parameter -c"
@@ -21,5 +21,5 @@ echo '  compiling C++'
 for variable_flags in '' '-DFW_DIRECT_PORT_CALLS'
 do
   echo "    variable_flags=$variable_flags"
-  $fprime_gcc $variable_flags $flags TypedPortsTopologyAc.cpp
+  $fprime_gcc $variable_flags $flags TypedPortsPassiveTopologyAc.cpp
 done

compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/subdirs.txt

@@ -3,4 +3,4 @@ Commands
 Health
 Params
 TlmPackets
-TypedPorts
+TypedPortsPassive

compiler/tools/fpp-to-cpp/test/top/run.sh

@@ -49,8 +49,8 @@ tlm_packets()
     diff_cpp TwoInstances_P1TlmPackets
 }
 
-typed_ports()
+typed_ports_passive()
 {
-  run_test "-p $PWD" typed_ports && \
-    diff_cpp TypedPortsTopology
+  run_test "-p $PWD" typed_ports_passive && \
+    diff_cpp TypedPortsPassiveTopology
 }

compiler/tools/fpp-to-cpp/test/top/tests.sh

@@ -6,5 +6,5 @@ nested_namespaces
 no_namespace
 params
 tlm_packets
-typed_ports
+typed_ports_passive
 "

compiler/tools/fpp-to-cpp/test/top/typed_ports_passive.fpp

@@ -50,7 +50,7 @@ module M {
   instance passiveSender: PassiveSender base id 0x100
   instance passiveReceiver: PassiveReceiver base id 0x200
 
-  topology TypedPorts {
+  topology TypedPortsPassive {
 
     instance passiveSender
     instance passiveReceiver

compiler/tools/fpp-to-cpp/test/top/update-ref.sh

@@ -49,8 +49,8 @@ tlm_packets()
   move_cpp TwoInstances_P1TlmPackets
 }
 
-typed_ports()
+typed_ports_passive()
 {
-  update "-p $PWD" typed_ports
-  move_cpp TypedPortsTopology
+  update "-p $PWD" typed_ports_passive
+  move_cpp TypedPortsPassiveTopology
 }