command-script: Add HOME support

f3d-app · Dec 28, 2024 · 1ecc22c · 1ecc22c
1 parent dd8532c
commit 1ecc22c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/application/F3DStarter.cxx b/application/F3DStarter.cxx
@@ -964,7 +964,7 @@ int F3DStarter::Start(int argc, char** argv)
     }
 
     // Process Command Script file
-    const std::string& commandScriptFile = this->Internals->AppOptions.CommandScriptFile;
+    std::string commandScriptFile = f3d::utils::collapsePath(this->Internals->AppOptions.CommandScriptFile);
     if (!commandScriptFile.empty())
     {
       std::ifstream scriptFile(commandScriptFile);

diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
@@ -1155,6 +1155,7 @@ if(NOT WIN32)
   f3d_test(NAME TestHOMEInteractionPlay DATA cow.vtp ARGS --interaction-test-play=~/Testing/Temporary/TestHOMEInteractionRecord.log DEPENDS TestHOMEInteractionRecord NO_BASELINE ENV "HOME=${CMAKE_BINARY_DIR}")
   f3d_test(NAME TestHOMEColorMapFile DATA dragon.vtu ARGS --colormap-file=~/testing/data/viridis8.png --scalar-coloring --coloring-component=1 ENV "HOME=${F3D_SOURCE_DIR}")
   f3d_test(NAME TestHOMEScreenshot DATA suzanne.ply ARGS --screenshot-filename=~/Testing/Temporary/TestHOMEScreenshot.png --interaction-test-play=${F3D_SOURCE_DIR}/testing/recordings/TestScreenshot.log REGEXP "saving screenshot to ${CMAKE_BINARY_DIR}/Testing/Temporary/TestHOMEScreenshot.png" NO_BASELINE ENV "HOME=${CMAKE_BINARY_DIR}")
+  f3d_test(NAME TestHOMECommandScript DATA suzanne.ply ARGS --command-script=~/testing/scripts/TestHOMECommandScript.txt REGEXP "Not coloring" NO_BASELINE ENV "HOME=${F3D_SOURCE_DIR}")
 endif()
 
 # Test failure without a reference, please do not create a TestNoRef.png file

diff --git a/testing/scripts/TestHOMECommandScript.txt b/testing/scripts/TestHOMECommandScript.txt
@@ -0,0 +1 @@
+print_scene_info