diff options
| author | Jeff Quast <contact@jeffquast.com> | 2015-04-24 21:19:03 -0700 |
|---|---|---|
| committer | Jeff Quast <contact@jeffquast.com> | 2015-04-24 21:19:03 -0700 |
| commit | 0744165d925c9720baecabf2d05dae0ddcc8fb0c (patch) | |
| tree | 90074cbf51d398dfcec07115984a7bb2f6524513 /tools | |
| parent | 5ded3108a0095ae6d94c3e25956ae6cd8ec33294 (diff) | |
| parent | 37223bf57518dd3c9a16eb65f7f78c7e1f88ead5 (diff) | |
| download | pexpect-git-0744165d925c9720baecabf2d05dae0ddcc8fb0c.tar.gz | |
Merge remote-tracking branch 'origin/freebsd-support' into bugfix-virtualenv
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/display-sighandlers.py | 6 | ||||
| -rwxr-xr-x | tools/teamcity-runtests.sh | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/display-sighandlers.py b/tools/display-sighandlers.py index 98445e9..f3559f7 100755 --- a/tools/display-sighandlers.py +++ b/tools/display-sighandlers.py @@ -12,7 +12,11 @@ for name, value in [(signal_name, getattr(signal, signal_name)) for signal_name in dir(signal) if signal_name.startswith('SIG') and not signal_name.startswith('SIG_')]: - handler = signal.getsignal(value) + try: + handler = signal.getsignal(value) + except ValueError: + # FreeBSD: signal number out of range + handler = 'out of range' description = { signal.SIG_IGN: "ignored(SIG_IGN)", signal.SIG_DFL: "default(SIG_DFL)" diff --git a/tools/teamcity-runtests.sh b/tools/teamcity-runtests.sh index be0b5b6..7025c23 100755 --- a/tools/teamcity-runtests.sh +++ b/tools/teamcity-runtests.sh @@ -14,6 +14,7 @@ export PYTHONIOENCODING=UTF8 export LANG=en_US.UTF-8 pyversion=$1 +shift here=$(cd `dirname $0`; pwd) osrel=$(uname -s) venv=teamcity-pexpect @@ -45,7 +46,7 @@ py.test \ --junit-xml=results.${osrel}.py${pyversion}.xml \ --verbose \ --verbose \ - || ret=$? + "$@" || ret=$? if [ $ret -ne 0 ]; then # we always exit 0, preferring instead the jUnit XML |