diff options
Diffstat (limited to 'tests.sh')
| -rwxr-xr-x | tests.sh | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -128,7 +128,7 @@ build_golang() { export PATH="$GOPATH/bin:$PATH" go get github.com/golang/protobuf/protoc-gen-go - cd examples && make gotest && cd .. + cd examples && PROTO_PATH="-I../src -I." make gotest && cd .. } use_java() { @@ -233,9 +233,10 @@ internal_install_python_deps() { sudo apt-get install -y python-software-properties # for apt-add-repository sudo apt-add-repository -y ppa:fkrull/deadsnakes sudo apt-get update -qq - sudo apt-get install -y python2.6 python2.6-dev sudo apt-get install -y python3.3 python3.3-dev sudo apt-get install -y python3.4 python3.4-dev + sudo apt-get install -y python3.5 python3.5-dev + sudo apt-get install -y python3.6 python3.6-dev fi } @@ -277,7 +278,7 @@ build_python() { cd python # Only test Python 2.6/3.x on Linux if [ $(uname -s) == "Linux" ]; then - envlist=py\{26,27,33,34\}-python + envlist=py\{27,33,34,35,36\}-python else envlist=py27-python fi @@ -291,10 +292,9 @@ build_python_cpp() { export LD_LIBRARY_PATH=../src/.libs # for Linux export DYLD_LIBRARY_PATH=../src/.libs # for OS X cd python - # Only test Python 2.6/3.x on Linux + # Only test Python 3.x on Linux if [ $(uname -s) == "Linux" ]; then - # py26 is currently disabled due to json_format - envlist=py\{27,33,34\}-cpp + envlist=py\{27,33,34,35,36\}-cpp else envlist=py27-cpp fi @@ -363,7 +363,6 @@ generate_php_test_proto() { proto/test_service_namespace.proto \ proto/test_descriptors.proto pushd ../../src - ./protoc --php_out=../php/tests/generated google/protobuf/empty.proto ./protoc --php_out=../php/tests/generated -I../php/tests -I. ../php/tests/proto/test_import_descriptor_proto.proto popd popd |