Changes in tests/test.py [afe8882:575a6e5]

File:

• tests/test.py (modified) (6 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')
@@ -162 +160 @@
                 if settings.dry_run or fileIsExecutable(exe_file) :
                         # run test
-                        retcode, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe_file, out_file), input = in_file)
+                        retcode, _ = sh("timeout 60 %s > %s 2>&1" % (exe_file, out_file), input = in_file)
                 else :
                         # simply cat the result into the output
@@ -174 +172 @@
 
         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
@@ -185 +182 @@
                 else :
                         # fetch return code and error from the diff command
+                        fixoutput(out_file)
                         retcode, error = diff(cmp_file, out_file)
 
@@ -236 +234 @@
                         tests,
                         chunksize = 1
-                ).get(settings.timeout.total)
+                ).get(7200)
         except KeyboardInterrupt:
                 pool.terminate()
@@ -285 +283 @@
         # users may want to simply list the tests
         if options.list_comp :
-                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --install --timeout --global-timeout -j --jobs ", end='')
+                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected -j --jobs ", end='')
                 print(" ".join(map(lambda t: "%s" % (t.target()), tests)))