Replace e3.os.process.Run with subprocess.run

We don't need a full-blown "Run" function from e3, which pulls a lot of dependencies and makes loading of test_support.py much slow.

Author: ptroja

testsuite/gnatprove/lib/python/test_support.py

@@ -10,7 +10,7 @@
 from fnmatch import fnmatch
 from time import sleep
 from shutil import which
-from e3.os.process import Run, STDOUT
+import subprocess
 from test_util import sort_key_for_errors
 
 
@@ -54,6 +54,13 @@
 is_mark = re.compile(r"@(\w*):(\w*)")
 
 
+def Run(command):
+ result = subprocess.run(
+ command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True
+ )
+ return result
+
+
 def benchmark_mode():
  if "benchmark" in os.environ:
  return os.environ["benchmark"]
@@ -732,15 +739,15 @@ def gcc(src, opt=None):
  cmd += to_list(opt)
  cmd += [src]
  process = Run(cmd)
- print_sorted(str.splitlines(process.out))
+ print_sorted(str.splitlines(process.stdout))
 
 
 def gprbuild(opt=None, sort_lines=True):
  """Call gprbuld -q **opt. Sort the output if sort_lines is True."""
  if opt is None:
  opt = []
- process = Run(["gprbuild", "-q"] + opt, error=STDOUT)
- lines = str.splitlines(process.out)
+ process = Run(["gprbuild", "-q"] + opt)
+ lines = str.splitlines(process.stdout)
  if len(lines) == 0:
  return
 
@@ -886,15 +893,15 @@ def gnatprove(
  # process = open("test.out", 'r').read()
 
  # Check marks in source code and print the command output sorted
- strlist = str.splitlines(process.out)
+ strlist = str.splitlines(process.stdout)
  # Replace line above by the one below for testing the scripts without
  # running the tool
  # strlist = str.splitlines(process)
 
  check_marks(strlist)
  check_fail(strlist, no_fail)
  # Check that the exit status is as expected
- if exit_status is not None and process.status != exit_status:
+ if exit_status is not None and process.returncode != exit_status:
  print("Unexpected exit status of", process.status)
  failure = True
  else:
@@ -1367,7 +1374,7 @@ def print_version():
  os.environ["LD_LIBRARY_PATH"] = ""
 
  p = Run(["gnatprove", "--version"])
- lines = p.out.splitlines()
+ lines = p.stdout.splitlines()
  # drop first line of output
  lines = lines[1:]
  for line in lines:

testsuite/gnatprove/tests/RA29-011__cvc4/test.py

@@ -7,7 +7,7 @@
 Env().add_path(bindir)
 
 process = Run(["cvc5", "--show-config"])
-lines = process.out.splitlines()
+lines = process.stdout.splitlines()
 # First three lines of cvc5 output contain date and exact compiler version, so
 # remove this output. We also remove the "scm" line which refers to the exact
 # git commit in some builds. Same for "portfolio", which is only available on

testsuite/gnatprove/tests/RA29-011__why3/test.py

@@ -6,4 +6,4 @@
 bindir = os.path.join(installdir, "libexec", "spark", "bin")
 Env().add_path(bindir)
 process = Run(["gnatwhy3", "--show-config"])
-print(process.out)
+print(process.stdout)