aboutsummaryrefslogtreecommitdiff
path: root/travis.sh
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2015-10-06 10:48:57 -0700
committerJisi Liu <jisi.liu@gmail.com>2015-10-06 10:48:57 -0700
commit72bd9c959ae309d6b0e1867a0a4f0cd1cc11089b (patch)
tree46a88578fd530776cbaa05133082e89dad0553d1 /travis.sh
parentf509c7b2f54ef309a5cc8250cd8d7456bf3b141d (diff)
downloadprotobuf-72bd9c959ae309d6b0e1867a0a4f0cd1cc11089b.tar.gz
protobuf-72bd9c959ae309d6b0e1867a0a4f0cd1cc11089b.tar.bz2
protobuf-72bd9c959ae309d6b0e1867a0a4f0cd1cc11089b.zip
disable tests for python-cpp under py26 as well.
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/travis.sh b/travis.sh
index 9cdf456e..6b050737 100755
--- a/travis.sh
+++ b/travis.sh
@@ -131,7 +131,7 @@ build_python() {
cd python
# Only test Python 2.6/3.x on Linux
if [ $(uname -s) == "Linux" ]; then
- # py26 is currently disabled due to json_format_test
+ # py26 is currently disabled due to json_format
envlist=py\{27,33,34\}-python
else
envlist=py27-python
@@ -148,7 +148,8 @@ build_python_cpp() {
cd python
# Only test Python 2.6/3.x on Linux
if [ $(uname -s) == "Linux" ]; then
- envlist=py\{26,27,33,34\}-cpp
+ # py26 is currently disabled due to json_format
+ envlist=py\{27,33,34\}-cpp
else
envlist=py27-cpp
fi