From 5c4052d771e4fe91eb2947a857d2a10eeae192fd Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 2 Mar 2015 13:28:12 -0800 Subject: Removed logging, returned other tests to .travis.yml --- .travis.yml | 6 ++++++ tools/run_tests/build_python.sh | 1 + tools/run_tests/run_python.sh | 4 ---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index eeb3dc2c85..de320b59a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,12 @@ env: global: - RUBY_VERSION=2.1 matrix: + - CONFIG=dbg TEST=c + - CONFIG=dbg TEST=c++ + - CONFIG=opt TEST=c + - CONFIG=opt TEST=c++ + - CONFIG=opt TEST=node + - CONFIG=opt TEST=ruby - CONFIG=opt TEST=python script: - rvm use $RUBY_VERSION diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh index 770dc9dc72..de633083c3 100755 --- a/tools/run_tests/build_python.sh +++ b/tools/run_tests/build_python.sh @@ -34,6 +34,7 @@ set -ex cd $(dirname $0)/../.. root=`pwd` +rm -rf python2.7_virtual_environment virtualenv -p /usr/bin/python2.7 python2.7_virtual_environment source python2.7_virtual_environment/bin/activate pip install enum34==1.0.4 futures==2.2.0 protobuf==3.0.0-alpha-1 diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh index 2df4e257bf..9c7dea008d 100755 --- a/tools/run_tests/run_python.sh +++ b/tools/run_tests/run_python.sh @@ -36,10 +36,6 @@ cd $(dirname $0)/../.. root=`pwd` export LD_LIBRARY_PATH=$root/libs/opt source python2.7_virtual_environment/bin/activate -ldd $PWD/python2.7_virtual_environment/bin/python -ldd $PWD/python2.7_virtual_environment/local/lib/python2.7/site-packages/grpc/_adapter/_c.so -objdump -T /lib/x86_64-linux-gnu/libc.so.6 -objdump -T /lib/x86_64-linux-gnu/libc.so.6 | grep clock_gettime # TODO(issue 215): Properly itemize these in run_tests.py so that they can be parallelized. # TODO(atash): Enable dynamic unused port discovery for this test. # TODO(mlumish): Re-enable this test when we can install protoc -- cgit v1.2.3