Changeset c76bd34 for tests/test.py

Timestamp:

Oct 7, 2020, 4:31:43 PM (5 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

848439f

Parents:

ae2c27a (diff), 597c5d18 (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 into master

File:

• tests/test.py (modified) (4 diffs)

tests/test.py

@@ -173 +173 @@
         test.prepare()
 
+        # ----------
+        # MAKE
+        # ----------
         # build, skipping to next test on error
         with Timed() as comp_dur:
                 make_ret, _ = make( test.target(), output_file=subprocess.DEVNULL, error=out_file, error_file = err_file )
 
+        # ----------
+        # RUN
+        # ----------
+        # run everything in a temp directory to make sure core file are handled properly
         run_dur = None
-        # run everything in a temp directory to make sure core file are handled properly
         with tempdir():
                 # if the make command succeeds continue otherwise skip to diff
@@ -207 +213 @@
                 else:
                         if os.stat(out_file).st_size < 1048576:
-                                with open (out_file, "r") as myfile:
+                                with open (out_file, "r", encoding='latin-1') as myfile:  # use latin-1 so all chars mean something.
                                         error = myfile.read()
                         else:
@@ -256 +262 @@
         make('clean', output_file=subprocess.DEVNULL, error=subprocess.DEVNULL)
 
-        # since python prints stacks by default on a interrupt, redo the interrupt handling to be silent
-        def worker_init():
-                def sig_int(signal_num, frame):
-                        pass
-
-                signal.signal(signal.SIGINT, sig_int)
-
-        # create the executor for our jobs and handle the signal properly
-        pool = multiprocessing.Pool(jobs, worker_init)
+        # create the executor for our jobs
+        pool = multiprocessing.Pool(jobs)
 
         failed = False
-
-        def stop(x, y):
-                print("Tests interrupted by user", file=sys.stderr)
-                sys.exit(1)
-        signal.signal(signal.SIGINT, stop)
 
         # for each test to run
@@ -360 +354 @@
                 failed = 0
 
+                # check if the expected files aren't empty
+                if not options.regenerate_expected:
+                        for t in tests:
+                                if is_empty(t.expect()):
+                                        print('WARNING: test "{}" has empty .expect file'.format(t.target()), file=sys.stderr)
+
                 # for each build configurations, run the test
                 with Timed() as total_dur: