Skip to content

Commit 4618675

Browse files
author
y-p
committed
BLD: travis make nose test selection clear via env_var
1 parent 8f92d9a commit 4618675

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ python:
66

77
env:
88
global:
9-
- # need at least this so travis page will show env column
9+
- NOSE_ARGS="not slow" # need at least this so travis page will show env column
1010

1111
matrix:
1212
include:
1313
- python: 2.7
14-
env: TEST_SLOW=true LOCALE_OVERRIDE="zh_CN.GB18030" # simplified chinese
14+
env: NOSE_ARGS="not network" LOCALE_OVERRIDE="zh_CN.GB18030"
1515
- python: 2.7
16-
env: FULL_DEPS=true
16+
env: NOSE_ARGS="not slow" FULL_DEPS=true
1717
- python: 3.2
18-
env: FULL_DEPS=true
18+
env: NOSE_ARGS="not slow" FULL_DEPS=true
1919

2020
# allow importing from site-packages,
2121
# so apt-get python-x works for system pythons

ci/script.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@ if [ x"$LOCALE_OVERRIDE" != x"" ]; then
99

1010
fi
1111

12-
if $TEST_SLOW ; then
13-
nosetests --exe -w /tmp -A "not network" pandas;
14-
exit
15-
else
16-
nosetests --exe -w /tmp -A "not slow" pandas;
17-
exit
18-
fi
12+
echo nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas;
13+
nosetests --exe -w /tmp -A "$NOSE_ARGS" pandas;
1914

2015
# if [ x"$VBENCH" == x"true" ]; then
2116
# python vb_suite/perf_HEAD.py;

0 commit comments

Comments
 (0)