Changeset cdbab55 for tests/test.py

Timestamp:

Aug 21, 2018, 2:24:29 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

2a6292d

Parents:

2b79a70 (diff), efa8b6a (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:/u/cforall/software/cfa/cfa-cc

File:

• tests/test.py (moved) (moved from src/tests/test.py ) (8 diffs)

tests/test.py

@@ -85 +85 @@
         # create a parser with the arguments for the tests script
         parser = argparse.ArgumentParser(description='Script which runs cforall tests')
-        parser.add_argument('--debug', help='Run all tests in debug or release', type=yes_no, default='no')
+        parser.add_argument('--debug', help='Run all tests in debug or release', type=yes_no, default='yes')
+        parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=yes_no, default='no')
         parser.add_argument('--arch', help='Test for specific architecture', type=str, default='')
+        parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=60)
+        parser.add_argument('--global-timeout', help='Maximum cumulative duration in seconds after the ALL tests are considered to have timed out', type=int, default=7200)
         parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
         parser.add_argument('--list', help='List all test available', action='store_true')
@@ -97 +100 @@
         parser.add_argument('tests', metavar='test', type=str, nargs='*', help='a list of tests to run')
 
-        options =  parser.parse_args()
+        try:
+                options =  parser.parse_args()
+        except:
+                print('ERROR: invalid arguments', file=sys.stderr)
+                parser.print_help(sys.stderr)
+                sys.exit(1)
 
         # script must have at least some tests to run or be listing
@@ -154 +162 @@
                 if settings.dry_run or fileIsExecutable(exe_file) :
                         # run test
-                        retcode, _ = sh("timeout 60 %s > %s 2>&1" % (exe_file, out_file), input = in_file)
+                        retcode, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe_file, out_file), input = in_file)
                 else :
                         # simply cat the result into the output
@@ -166 +174 @@
 
         if retcode == 0:
+                # fixoutput(out_file)
                 if settings.generating :
                         # if we are ounly generating the output we still need to check that the test actually exists
@@ -176 +185 @@
                 else :
                         # fetch return code and error from the diff command
-                        fixoutput(out_file)
                         retcode, error = diff(cmp_file, out_file)
 
@@ -228 +236 @@
                         tests,
                         chunksize = 1
-                ).get(7200)
+                ).get(settings.timeout.total)
         except KeyboardInterrupt:
                 pool.terminate()
@@ -277 +285 @@
         # users may want to simply list the tests
         if options.list_comp :
-                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected -j --jobs ", end='')
+                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --install --timeout --global-timeout -j --jobs ", end='')
                 print(" ".join(map(lambda t: "%s" % (t.target()), tests)))
 
@@ -285 +293 @@
 
         else :
+                # check the build configuration works
+                settings.validate()
+
                 options.jobs, forceJobs = jobCount( options, tests )
                 settings.updateMakeCmd(forceJobs, options.jobs)