Changeset afe8882 for tests/test.py

Timestamp:

Aug 15, 2018, 3:51:12 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

bdff89d

Parents:

7bd4cc9

Message:

Fixed calling tests from outside directory and added arguments to change test timeouts (still can't be configured for a specific test)

File:

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

tests/test.py

@@ -88 +88 @@
         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')
@@ -160 +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
@@ -234 +236 @@
                         tests,
                         chunksize = 1
-                ).get(7200)
+                ).get(settings.timeout.total)
         except KeyboardInterrupt:
                 pool.terminate()
@@ -283 +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)))