Skip to content

Backport test abort on timeout to v4.x #11351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
misterdjules wants to merge 2 commits into from
Closed

Backport test abort on timeout to v4.x #11351

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82dab73
test: add --abort-on-timeout option to test.py
Jan 31, 2017
3abf144
test: fix test.py command line options processing
Feb 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test: fix test.py command line options processing 
#11086 had introduced a regression
that broke command line options processing for tools/test.py.

Basically, it made tools/test.py discard the command line argument that
would be passed after `--abort-on-timeout`. For instance, when running:

```
$ python tools/test.py --abort-on-timeout path/to/some-test
```

all tests would be run because the last command line argument
(`/path/to/some-test`) would be discarded.

This change fixes this regression.

Refs: #11086
PR-URL: #11153
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
Julien Gilli committed Feb 13, 2017
commit 3abf144fba54b03ce8a1b9fe30bcc265884905bf
2 changes: 1 addition & 1 deletion tools/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,7 @@ def BuildOptions():
default=1, type="int")
result.add_option('--abort-on-timeout',
help='Send SIGABRT instead of SIGTERM to kill processes that time out',
default=False, dest="abort_on_timeout")
default=False, action="store_true", dest="abort_on_timeout")
return result


Expand Down