fix exit code and print $args received by ps1

JuliaParallel · Mar 21, 2024 · ce902a7 · ce902a7
1 parent 6a627ea
commit ce902a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/bin/mpiexecjl_windows.ps1 b/bin/mpiexecjl_windows.ps1
@@ -24,6 +24,8 @@ function usage {
 $julia_args = @()
 $PROJECT_ARG = ""
 
+echo $args
+
 foreach ($arg in $args) {
     if ($arg -match "^--project(=.*)?$") {
         $PROJECT_ARG = $arg
@@ -55,7 +57,11 @@ if ($env:JULIA_BINDIR) {
 $SCRIPT = @'
 using MPI
 ENV[\"JULIA_PROJECT\"] = dirname(Base.active_project())
-mpiexec(exe -> run(`$exe $ARGS`))
+try
+    mpiexec(exe -> run(`$exe $ARGS`))
+catch e
+    rethrow(e)
+end
 '@
 
 $PRECOMPILATION_SCRIPT = @'
@@ -74,4 +80,7 @@ if ($PROJECT_ARG) {
     & $JULIA_CMD $PROJECT_ARG --color=yes --startup-file=no --compile=min -O0 -e $SCRIPT -- $julia_args
 } else {
     & $JULIA_CMD --color=yes --startup-file=no --compile=min -O0 -e $SCRIPT -- $julia_args
-}
+}
+
+# Guarantees that we will exit .ps1 with the same process status as the last command executed
+exit $lastExitCode
diff --git a/test/mpiexecjl.jl b/test/mpiexecjl.jl
@@ -34,7 +34,7 @@ using MPI
         example = joinpath(@__DIR__, "..", "docs", "examples", "01-hello.jl")
         env = ["JULIA_BINDIR" => Sys.BINDIR]
         p = withenv(env...) do
-            run(`$(additional_initial_parts_cmd) $(mpiexecjl) -n $(nprocs) --project=$(dir) $(julia) --startup-file=no -q $(example)`)
+            run(`$(additional_initial_parts_cmd) $(mpiexecjl) -n $(nprocs) --project=$(dir) $(julia) $(example)`)
         end
         @test success(p)
         # Test help messages