Skip to content

Commit

Permalink
Merge pull request grpc#1068 from soltanmm/fix-py-test
Browse files Browse the repository at this point in the history
Fix Python test ignorance of build config
  • Loading branch information
nathanielmanistaatgoogle committed Mar 17, 2015
2 parents 09eaec0 + 65af063 commit 78f1caa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tools/run_tests/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ 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
CFLAGS=-I$root/include LDFLAGS=-L$root/libs/opt pip install src/python/src
CFLAGS=-I$root/include LDFLAGS=-L$root/libs/$CONFIG pip install src/python/src
pip install src/python/interop
2 changes: 1 addition & 1 deletion tools/run_tests/run_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ set -ex
cd $(dirname $0)/../..

root=`pwd`
export LD_LIBRARY_PATH=$root/libs/opt
export LD_LIBRARY_PATH=$root/libs/$CONFIG
source python2.7_virtual_environment/bin/activate
python2.7 -B $*

0 comments on commit 78f1caa

Please sign in to comment.