Commitcca6e68

authored and

committed

Merge pull request#10217 from QuLogic/travis-fixup

TST: Don't use set -e.

1 parent811c88e commitcca6e68Copy full SHA for cca6e68

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#! /bin/bash`
`2`	`2`
`3`		`-set -ev`
	`3`	`+set -ex`
`4`	`4`
`5`	`5`	`# This script is meant to be called by the "script" step defined in`
`6`	`6`	`# .travis.yml. See http://docs.travis-ci.com/ for more details.`
`@@ -21,8 +21,5 @@ export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 429496`
`21`	`21`	`echo PYTHONHASHSEED=$PYTHONHASHSEED`
`22`	`22`
`23`	`23`	`echo The following args are passed to pytest$PYTEST_ARGS$RUN_PEP8`
`24`		`-if [[$TRAVIS_OS_NAME=='osx' ]];then`
`25`		`- pytest$PYTEST_ARGS$RUN_PEP8`
`26`		`-else`
`27`		`- gdb -return-child-result -batch -ex r -ex bt --args python$PYTHON_ARGS -m pytest$PYTEST_ARGS$RUN_PEP8`
`28`		`-fi`
	`24`	`+`
	`25`	`+pytest$PYTEST_ARGS$RUN_PEP8`

Comments

(0)