subprocess_run: correct stdin for Fortran

Author: scivision

+stdlib/subprocess_run.m

@@ -81,7 +81,12 @@
 %% stdin pipe
 if strlength(opt.stdin) > 0
   writer = java.io.BufferedWriter(java.io.OutputStreamWriter(h.getOutputStream()));
-  writer.write(opt.stdin);
+  stdin_text = opt.stdin;
+  if ~endsWith(stdin_text, newline)
+    % Fortran (across compilers) needs a \n at the end of stdin.
+    stdin_text = stdin_text + newline;
+  end
+  writer.write(stdin_text);
   writer.flush()
   writer.close()
 end

.gitignore

@@ -10,6 +10,8 @@ docs/
 *.mex*
 *.oct
 
-test/printer_c.exe
-test/printer_fortran.exe
+test/stdout_stderr_c.exe
+test/stdout_stderr_fortran.exe
+test/stdin_cpp.exe
+test/stdin_fortran.exe
 test/sleep.exe

buildfile.m

@@ -99,16 +99,23 @@ function publishTask(context)
 function subprocess_build_c(context)
 
 td = context.Plan.RootFolder + "/test";
-src = td + "/main.c";
-exe = td + "/printer_c.exe";
+src = td + "/stdout_stderr_c.c";
 
-cmd = get_build_cmd("c", src);
-if isempty(cmd), return, end
-cmd = join([cmd, exe]);
+for s = src
+  [~, n] = fileparts(s);
+  exe = fullfile(td, n + ".exe");
+  if stdlib.get_modtime(s) < stdlib.get_modtime(exe)
+    continue
+  end
 
-[r, m] = system(cmd);
-if r ~= 0
-  warning("failed to build TestSubprocess printer_c.exe " + m)
+  cmd = get_build_cmd("c++", s);
+  if isempty(cmd), return, end
+  cmd = cmd + exe;
+  disp(cmd)
+  [r, m] = system(cmd);
+  if r ~= 0
+    disp("failed to build TestSubprocess " + exe + " " + m)
+  end
 end
 
 end
@@ -117,16 +124,23 @@ function subprocess_build_c(context)
 function subprocess_build_cpp(context)
 
 td = context.Plan.RootFolder + "/test";
-src = td + "/sleep.cpp";
-exe = td + "/sleep.exe";
+src = [td + "/sleep.cpp", td + "/stdin_cpp.cpp"];
 
-cmd = get_build_cmd("c++", src);
-if isempty(cmd), return, end
-cmd = join([cmd, exe]);
+for s = src
+  [~, n] = fileparts(s);
+  exe = fullfile(td, n + ".exe");
+  if stdlib.get_modtime(s) < stdlib.get_modtime(exe)
+    continue
+  end
 
-[r, m] = system(cmd);
-if r ~= 0
-  warning("failed to build TestSubprocess " + exe + " " + m)
+  cmd = get_build_cmd("c++", s);
+  if isempty(cmd), return, end
+  cmd = cmd + exe;
+  disp(cmd)
+  [r, m] = system(cmd);
+  if r ~= 0
+    disp("failed to build TestSubprocess " + exe + " " + m)
+  end
 end
 
 end
@@ -135,16 +149,23 @@ function subprocess_build_cpp(context)
 function subprocess_build_fortran(context)
 
 td = context.Plan.RootFolder + "/test";
-src = td + "/main.f90";
-exe = td + "/printer_fortran.exe";
+src = [td + "/stdout_stderr_fortran.f90", td + "/stdin_fortran.f90"];
 
-cmd = get_build_cmd("Fortran", src);
-if isempty(cmd), return, end
-cmd = join([cmd, exe]);
+for s = src
+  [~, n] = fileparts(s);
+  exe = fullfile(td, n + ".exe");
+  if stdlib.get_modtime(s) < stdlib.get_modtime(exe)
+    continue
+  end
 
-[r, m] = system(cmd);
-if r ~= 0
-  warning("failed to build TestSubprocess " + exe + " " + m)
+  cmd = get_build_cmd("Fortran", s);
+  if isempty(cmd), return, end
+  cmd = cmd + exe;
+  disp(cmd)
+  [r, m] = system(cmd);
+  if r ~= 0
+    disp("failed to build TestSubprocess " + exe + " " + m)
+  end
 end
 
 end
@@ -159,28 +180,27 @@ function subprocess_build_fortran(context)
   if lang == "Fortran"
     fc = getenv("FC");
     if isempty(fc)
-      warning("set FC environment variable to the Fortran compiler executable, or do 'mex -setup fortran' to configure the Fortran compiler")
+      disp("set FC environment variable to the Fortran compiler executable, or do 'mex -setup fortran' to configure the Fortran compiler")
     end
   end
-  warning(lang + " compiler not found")
+  disp(lang + " compiler not found")
   return
 else
   comp = co.Details.CompilerExecutable;
 end
 
 outFlag = "-o";
-shell = "";
-shell_arg = "";
-msvcLike = ispc && endsWith(comp, "cl");
+shell = string.empty;
+msvcLike = ispc && (contains(co.Name, "Visual Studio"));
 if msvcLike
-  shell = strtrim(co.Details.CommandLineShell);
-  shell_arg = co.Details.CommandLineShellArg;
-  outFlag = "/link /out:";
+  shell = join([strcat('"',string(co.Details.CommandLineShell),'"'), ...
+                co.Details.CommandLineShellArg], " ");
+  outFlag = "/Fo" + tempdir + " /link /out:";
 end
 
 cmd = join([comp, src, outFlag]);
-if shell ~= ""
-  cmd = join([shell, shell_arg, cmd]);
+if ~isempty(shell)
+  cmd = join([shell, "&&", cmd]);
 end
 
 end

test/TestSubprocess.m

@@ -1,5 +1,10 @@
 classdef TestSubprocess < matlab.unittest.TestCase
 
+properties (TestParameter)
+lang_out = {"c", "fortran"}
+lang_in = {"cpp", "fortran"}
+end
+
 methods(TestClassSetup)
 function java_required(tc)
 tc.assumeTrue(stdlib.has_java())
@@ -9,33 +14,32 @@ function java_required(tc)
 
 methods (Test)
 
-function test_exe_c(tc)
+function test_stdout_stderr(tc, lang_out)
 import matlab.unittest.constraints.IsFile
 
 cwd = fileparts(mfilename('fullpath'));
-exe = cwd + "/printer_c.exe";
+exe = cwd + "/stdout_stderr_" + lang_out + ".exe";
 tc.assumeThat(exe, IsFile, exe + " not found")
 
 [status, msg, err] = stdlib.subprocess_run(exe);
 tc.assertEqual(status, 0, err)
 tc.verifyEqual(msg, "stdout")
 tc.verifyEqual(err, "stderr")
-
 end
 
 
-function test_exe_fortran(tc)
+function test_stdin(tc, lang_in)
 import matlab.unittest.constraints.IsFile
 
 cwd = fileparts(mfilename('fullpath'));
-exe = cwd + "/printer_fortran.exe";
+exe = cwd + "/stdin_" + lang_in + ".exe";
 tc.assumeThat(exe, IsFile, exe + " not found")
 
-[status, msg, err] = stdlib.subprocess_run(exe);
-tc.assertEqual(status, 0, err)
-tc.verifyEqual(msg, "stdout")
-tc.verifyEqual(err, "stderr")
+[status, msg, err] = stdlib.subprocess_run(exe, stdin="1 2");
 
+tc.assertEqual(status, 0, err)
+tc.verifyEqual(msg, "3")
+tc.verifyEqual(err, "")
 end
 
 

test/stdin_cpp.cpp

@@ -0,0 +1,13 @@
+#include <iostream>
+#include <cstdlib>
+
+int main() {
+
+int a, b;
+
+std::cin >> a >> b;
+
+std::cout << a + b << "\n";
+
+return EXIT_SUCCESS;
+}

test/stdin_fortran.f90

@@ -0,0 +1,22 @@
+program stdin_pipe
+
+use, intrinsic :: iso_fortran_env
+
+implicit none
+
+integer :: a, b, i
+
+! Python and Matlab have the same issue with stdin truncation in Fortran across compilers.
+! >>> subprocess.run("stdin_fortran.exe", input="1 2", capture_output=True, text=True)
+! CompletedProcess(args='stdin_fortran.exe', returncode=0, stdout='     0.000\n', stderr='')
+! >>> subprocess.run("stdin_fortran.exe", input="1 2\n", capture_output=True, text=True)
+! CompletedProcess(args='stdin_fortran.exe', returncode=0, stdout='     3.000\n', stderr='')
+
+read(input_unit, *, iostat=i) a, b
+if (i == iostat_end) error stop "stdin was truncated -- add a newline at the end of the stdin input"
+if (i /= 0) error stop "stdin read error"
+
+
+write(output_unit, '(i0)') a + b
+
+end program