Changeset ae151cf for tests

Timestamp:

Oct 2, 2022, 10:00:43 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

815943f

Parents:

f704974 (diff), f92e7b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• configs/.expect/parseconfig.txt (moved) (moved from tests/.expect/parseconfig.txt)
• configs/.in/parseconfig-all.txt (moved) (moved from tests/.in/parseconfig-all.txt)
• configs/.in/parseconfig-errors.txt (moved) (moved from tests/.in/parseconfig-errors.txt)
• configs/.in/parseconfig-missing.txt (moved) (moved from tests/.in/parseconfig-missing.txt)
• configs/parseconfig.cfa (moved) (moved from tests/parseconfig.cfa)
• meta/.expect/fork+exec.txt (added)
• meta/fork+exec.cfa (added)
• pybin/tools.py (modified) (2 diffs)
• test.py (modified) (2 diffs)

tests/pybin/tools.py

@@ -23 +23 @@
 
 # helper functions to run terminal commands
-def sh(*cmd, timeout = False, output_file = None, input_file = None, input_text = None, error = subprocess.STDOUT, ignore_dry_run = False, pass_fds = []):
+def sh(*cmd, timeout = False, output_file = None, input_file = None, input_text = None, error = subprocess.STDOUT, ignore_dry_run = False, pass_fds = [], nice = False):
         try:
                 cmd = list(cmd)
@@ -58 +58 @@
                         error = openfd(error, 'w', onexit, False)
 
+                        # prepare the parameters to the call
+                        popen_kwargs = {
+                                'stdout' : output_file,
+                                'stderr' : error,
+                                'pass_fds': pass_fds,
+                        }
+
+                        # depending on how we are passing inputs we need to set a different argument to popen
+                        if input_text:
+                                popen_kwargs['input'] = bytes(input_text, encoding='utf-8')
+                        else:
+                                popen_kwargs['stdin'] = input_file
+
+                        # we might want to nice this so it's not to obnixious to users
+                        if nice:
+                                popen_kwargs['preexec_fn'] = lambda: os.nice(5)
+
                         # run the desired command
                         # use with statement to make sure proc is cleaned
                         # don't use subprocess.run because we want to send SIGABRT on exit
-                        with subprocess.Popen(
-                                cmd,
-                                **({'input' : bytes(input_text, encoding='utf-8')} if input_text else {'stdin' : input_file}),
-                                stdout  = output_file,
-                                stderr  = error,
-                                pass_fds = pass_fds
-                        ) as proc:
-
+                        with subprocess.Popen( cmd, **popen_kwargs ) as proc:
                                 try:
                                         out, errout = proc.communicate(

tests/test.py

@@ -23 +23 @@
 
         def match_test(path):
-                match = re.search("^%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt$" % settings.SRCDIR, path)
+                match = re.search("^%s\/([\w\/\-_]*).expect\/([\w\-_\+]+)(\.[\w\-_]+)?\.txt$" % settings.SRCDIR, path)
                 if match :
                         test = Test()
@@ -190 +190 @@
                                 if settings.dry_run or is_exe(exe_file):
                                         # run test
-                                        retcode, _, _ = sh(exe_file, output_file=out_file, input_file=in_file, timeout=True)
+                                        retcode, _, _ = sh(exe_file, output_file=out_file, input_file=in_file, timeout=True, nice=True)
                                 else :
                                         # simply cat the result into the output