From cedab130c2de43a5bde281f03ee25012c47c2034 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Mon, 2 Mar 2015 10:42:24 -0800
Subject: [PATCH] Put tests back in a useful state
---
.travis.yml | 6 ++++++
tools/run_tests/build_python.sh | 2 --
tools/run_tests/run_python.sh | 36 +++++++++++++++------------------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index dd5fc84fb5..1099aa5dfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,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 6ce2d354bf..770dc9dc72 100755
--- a/tools/run_tests/build_python.sh
+++ b/tools/run_tests/build_python.sh
@@ -36,7 +36,5 @@ cd $(dirname $0)/../..
root=`pwd`
virtualenv -p /usr/bin/python2.7 python2.7_virtual_environment
source python2.7_virtual_environment/bin/activate
-echo $PATH
-which pip
pip install enum34==1.0.4 futures==2.2.0 protobuf==3.0.0-alpha-1
CFLAGS=-I$root/include LDFLAGS=-L$root/libs/opt pip install src/python/src
diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh
index 16fee1a761..58e55b0a41 100755
--- a/tools/run_tests/run_python.sh
+++ b/tools/run_tests/run_python.sh
@@ -36,27 +36,23 @@ cd $(dirname $0)/../..
root=`pwd`
export LD_LIBRARY_PATH=$root/libs/opt
source python2.7_virtual_environment/bin/activate
-echo $PATH
-ls -l python2.7_virtual_environment
-ls -l python2.7_virtual_environment/bin
-which python
# 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.
-python -B test/compiler/python_plugin_test.py --build_mode=opt
-python -B -m grpc._adapter._blocking_invocation_inline_service_test
-python -B -m grpc._adapter._c_test
-python -B -m grpc._adapter._event_invocation_synchronous_event_service_test
-python -B -m grpc._adapter._future_invocation_asynchronous_event_service_test
-python -B -m grpc._adapter._links_test
-python -B -m grpc._adapter._lonely_rear_link_test
-python -B -m grpc._adapter._low_test
-python -B -m grpc.early_adopter.implementations_test
-python -B -m grpc.framework.assembly.implementations_test
-python -B -m grpc.framework.base.packets.implementations_test
-python -B -m grpc.framework.face.blocking_invocation_inline_service_test
-python -B -m grpc.framework.face.event_invocation_synchronous_event_service_test
-python -B -m grpc.framework.face.future_invocation_asynchronous_event_service_test
-python -B -m grpc.framework.foundation._later_test
-python -B -m grpc.framework.foundation._logging_pool_test
+# python2.7 -B test/compiler/python_plugin_test.py --build_mode=opt
+python2.7 -B -m grpc._adapter._blocking_invocation_inline_service_test
+python2.7 -B -m grpc._adapter._c_test
+python2.7 -B -m grpc._adapter._event_invocation_synchronous_event_service_test
+python2.7 -B -m grpc._adapter._future_invocation_asynchronous_event_service_test
+python2.7 -B -m grpc._adapter._links_test
+python2.7 -B -m grpc._adapter._lonely_rear_link_test
+python2.7 -B -m grpc._adapter._low_test
+python2.7 -B -m grpc.early_adopter.implementations_test
+python2.7 -B -m grpc.framework.assembly.implementations_test
+python2.7 -B -m grpc.framework.base.packets.implementations_test
+python2.7 -B -m grpc.framework.face.blocking_invocation_inline_service_test
+python2.7 -B -m grpc.framework.face.event_invocation_synchronous_event_service_test
+python2.7 -B -m grpc.framework.face.future_invocation_asynchronous_event_service_test
+python2.7 -B -m grpc.framework.foundation._later_test
+python2.7 -B -m grpc.framework.foundation._logging_pool_test
# TODO(nathaniel): Get tests working under 3.4 (requires 3.X-friendly protobuf)
# python3.4 -B -m unittest discover -s src/python -p '*.py'
--
GitLab