Merge pull request #593 from PhilipDeegan/vargs

cmake: allow cli args to python calls
PHAREHUB · Oct 1, 2021 · 88f960f · 88f960f
2 parents bb367b1 + a58db5e
commit 88f960f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/res/cmake/test.cmake b/res/cmake/test.cmake
@@ -17,10 +17,15 @@
 #    execute exe identified by target in directory
 #      if level >= PHARE_EXEC_LEVEL_MIN AND level <= PHARE_EXEC_LEVEL_MAX
 #
-#  phare_python3_exec(level target file directory)
+#  phare_python3_exec(level target file directory $ARGS)
 #    execute file identified by target in directory
 #      if level >= PHARE_EXEC_LEVEL_MIN AND level <= PHARE_EXEC_LEVEL_MAX
 #
+#  Note to developers - do not use cmake variable function arguments for functions
+#      phare_python3_exec
+#      phare_mpi_python3_exec
+#   if these function calls are to files executing python unit tests as they will interfere
+
 
 
 if (test AND ${PHARE_EXEC_LEVEL_MIN} GREATER 0) # 0 = no tests
@@ -121,27 +126,35 @@ if (test AND ${PHARE_EXEC_LEVEL_MIN} GREATER 0) # 0 = no tests
 
   function(phare_python3_exec level target file directory)
     if(${level} GREATER_EQUAL ${PHARE_EXEC_LEVEL_MIN} AND ${level} LESS_EQUAL ${PHARE_EXEC_LEVEL_MAX})
-      add_test(NAME py3_${target} COMMAND python3 -u ${file} WORKING_DIRECTORY ${directory})
+      string (REPLACE ";" " " CLI_ARGS "${ARGN}")
+      add_test(NAME py3_${target} COMMAND python3 -u ${file} ${CLI_ARGS} WORKING_DIRECTORY ${directory})
       set_exe_paths_(py3_${target})
     endif()
   endfunction(phare_python3_exec)
   # use
-  #  phare_python3_exec(1 test_id script.py ${CMAKE_CURRENT_BINARY_DIR})
+  #  phare_python3_exec(1 test_id script.py ${CMAKE_CURRENT_BINARY_DIR} $ARGS)
 
 
   function(phare_mpi_python3_exec level N target file directory)
     if(${level} GREATER_EQUAL ${PHARE_EXEC_LEVEL_MIN} AND ${level} LESS_EQUAL ${PHARE_EXEC_LEVEL_MAX})
+      string (REPLACE ";" " " CLI_ARGS "${ARGN}")
       if(${N} EQUAL 1)
-        add_test(NAME py3_${target} COMMAND python3 -u ${file} WORKING_DIRECTORY ${directory})
+        add_test(
+            NAME py3_${target}
+            COMMAND python3 -u ${file} ${CLI_ARGS}
+            WORKING_DIRECTORY ${directory})
         set_exe_paths_(py3_${target})
       else()
-        add_test(NAME py3_${target}_mpi_n_${N} COMMAND mpirun -n ${N} python3 -u ${file} WORKING_DIRECTORY ${directory})
+        add_test(
+            NAME py3_${target}_mpi_n_${N}
+            COMMAND mpirun -n ${N} python3 -u ${file} ${CLI_ARGS}
+            WORKING_DIRECTORY ${directory})
         set_exe_paths_(py3_${target}_mpi_n_${N})
       endif()
     endif()
   endfunction(phare_mpi_python3_exec)
   # use
-  #  phare_mpi_python3_exec(1 2 test_id script.py ${CMAKE_CURRENT_BINARY_DIR})
+  #  phare_mpi_python3_exec(1 2 test_id script.py ${CMAKE_CURRENT_BINARY_DIR} $ARGS)
 
   set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${PHARE_PROJECT_DIR})
 

diff --git a/tests/simulator/__init__.py b/tests/simulator/__init__.py
@@ -3,6 +3,14 @@
 import pyphare.pharein as ph, numpy as np
 from pyphare.pharein import ElectronModel
 
+
+def parse_cli_args(pop_from_sys = True):
+    import sys
+    r = sys.argv[1:].copy()
+    if pop_from_sys: # args can interfere with other things
+        sys.argv = [sys.argv[0]]
+    return r
+
 # Block accidental dictionary key rewrites
 class NoOverwriteDict(dict):
     def __init__(self, dict):