Fix header paths in test impl code

Update unit tests
nasa · Nov 29, 2023 · 68753f7 · 68753f7
1 parent 4ff4235
commit 68753f7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentImplWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentImplWriter.scala
@@ -53,7 +53,7 @@ case class ComponentImplWriter(
     val path = s.removeLongestPathPrefix(fullPath)
     val userHeaders = List(
       "FpConfig.hpp",
-      s"${path}.hpp"
+      s"$path.hpp"
     )
     linesMember(
       addBlankPrefix(userHeaders.sorted.map(CppWriter.headerString).map(line)),

diff --git a/.../main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTestImplWriter.scala b/.../main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTestImplWriter.scala
@@ -39,10 +39,15 @@ case class ComponentTestImplWriter(
   }
 
   private def getHppIncludes: CppDoc.Member = {
+    def getHeaderPath(fileName: String): String = {
+      val loc = symbol.getLoc.tuLocation
+      val fullPath = loc.getNeighborPath(fileName)
+      s"${s.removeLongestPathPrefix(fullPath)}.hpp"
+    }
     val headers = List(
-      s"${s.getRelativePath(ComputeCppFiles.FileNames.getComponentGTestBase(name))}.hpp",
-      s"${s.getRelativePath(ComputeCppFiles.FileNames.getComponentImpl(name))}.hpp"
-    )
+      ComputeCppFiles.FileNames.getComponentGTestBase(name),
+      ComputeCppFiles.FileNames.getComponentImpl(name)
+    ).map(getHeaderPath)
     linesMember(
       addBlankPrefix(headers.map(CppWriter.headerString).map(line))
     )

diff --git a/compiler/tools/fpp-to-cpp/test/component/impl/check-cpp b/compiler/tools/fpp-to-cpp/test/component/impl/check-cpp
@@ -25,5 +25,5 @@ do
   cp $base.template.ref.hpp $base.hpp
   cp $base.template.ref.cpp $base.cpp
   echo "compiling $base.cpp"
-  $fprime_gcc -I../../../.. -I.. -c $base.cpp $warning_flags
+  $fprime_gcc -I../../../.. -c $base.cpp $warning_flags
 done
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/run.sh b/compiler/tools/fpp-to-cpp/test/component/test-impl/run.sh
@@ -5,13 +5,13 @@ empty()
 {
   # Run the empty test in auto setup mode
   # This tests auto setup
-  run_test "-a -u -t -i `cat ../deps-comma.txt`" "-p $PWD,$fprime_dir ../empty" empty && \
+  run_test "-a -u -t -i `cat ../deps-comma.txt`" "-p $component_dir,$fprime_dir ../empty" empty && \
   diff_test_template Empty
 }
 
 passive()
 {
-  run_test "-u -t -i `cat ../deps-comma.txt`" "-p $PWD,$fprime_dir ../passive" passive && \
+  run_test "-u -t -i `cat ../deps-comma.txt`" "-p $component_dir,$fprime_dir ../passive" passive && \
   diff_test_template PassiveCommands && \
   diff_test_template PassiveEvents && \
   diff_test_template PassiveGetProductPortsOnly && \
@@ -27,7 +27,7 @@ passive()
 
 active()
 {
-  run_test "-u -t -i `cat ../deps-comma.txt`" "-p $PWD,$fprime_dir ../active" active && \
+  run_test "-u -t -i `cat ../deps-comma.txt`" "-p $component_dir,$fprime_dir ../active" active && \
   diff_test_template ActiveAsyncProductPortsOnly && \
   diff_test_template ActiveAsyncProducts && \
   diff_test_template ActiveCommands && \
@@ -43,7 +43,7 @@ active()
 
 queued()
 {
-  run_test "-u -t -i `cat ../deps-comma.txt`" "-p $PWD,$fprime_dir ../queued" queued && \
+  run_test "-u -t -i `cat ../deps-comma.txt`" "-p $component_dir,$fprime_dir ../queued" queued && \
   diff_test_template QueuedTest && \
   diff_test_template QueuedSerial && \
   diff_test_template QueuedCommands && \

diff --git a/compiler/tools/fpp-to-cpp/test/component/test-impl/update-ref.sh b/compiler/tools/fpp-to-cpp/test/component/test-impl/update-ref.sh
@@ -5,13 +5,13 @@ empty()
 {
   # Run the empty test in auto setup mode
   # This tests auto setup
-  update "-a -u -t -i `cat ../deps-comma.txt`" "-p $PWD,$fprime_dir ../empty" empty
+  update "-a -u -t -i `cat ../deps-comma.txt`" "-p $component_dir,$fprime_dir ../empty" empty
   move_test_template Empty
 }
 
 passive()
 {
-  update "-u -t -i `cat ../deps-comma.txt`" "-p $PWD,$fprime_dir ../passive" passive
+  update "-u -t -i `cat ../deps-comma.txt`" "-p $component_dir,$fprime_dir ../passive" passive
   move_test_template PassiveCommands
   move_test_template PassiveEvents
   move_test_template PassiveGetProductPortsOnly
@@ -27,7 +27,7 @@ passive()
 
 active()
 {
-  update "-u -t -i `cat ../deps-comma.txt`" "-p $PWD,$fprime_dir ../active" active
+  update "-u -t -i `cat ../deps-comma.txt`" "-p $component_dir,$fprime_dir ../active" active
   move_test_template ActiveAsyncProductPortsOnly
   move_test_template ActiveAsyncProducts
   move_test_template ActiveCommands
@@ -43,7 +43,7 @@ active()
 
 queued()
 {
-  update "-u -t -i `cat ../deps-comma.txt`" "-p $PWD,$fprime_dir ../queued" queued
+  update "-u -t -i `cat ../deps-comma.txt`" "-p $component_dir,$fprime_dir ../queued" queued
   move_test_template QueuedCommands
   move_test_template QueuedEvents
   move_test_template QueuedGetProducts