aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Paul Yang <TeBoring@users.noreply.github.com>2016-10-07 16:09:26 -0700
committerGravatar Bo Yang <teboring@google.com>2016-10-10 11:44:54 -0700
commitdaba6653f1289b58873c2ae993afcdb82035d2fb (patch)
tree5879fa426bd0cf22df5a7ee39d25b8ece7c117f8
parent5be6325c1f000f7b7d6655cb5b6ecbf4f0e52017 (diff)
Fix python_cpp test on Mac. Link staticly when building extension, so that the extension doesn't require installing protobuf library. (#2232)
-rw-r--r--python/tox.ini2
-rwxr-xr-xtests.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/python/tox.ini b/python/tox.ini
index cf8d5401..1600db21 100644
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -12,7 +12,7 @@ setenv =
commands =
python setup.py -q build_py
python: python setup.py -q build
- cpp: python setup.py -q build --cpp_implementation --warnings_as_errors
+ cpp: python setup.py -q build --cpp_implementation --warnings_as_errors --compile_static_extension
python: python setup.py -q test -q
cpp: python setup.py -q test -q --cpp_implementation
python: python setup.py -q test_conformance
diff --git a/tests.sh b/tests.sh
index a497f1d2..fb7044f3 100755
--- a/tests.sh
+++ b/tests.sh
@@ -28,7 +28,8 @@ internal_build_cpp() {
fi
./autogen.sh
- ./configure
+ ./configure CXXFLAGS="-fPIC" # -fPIC is needed for python cpp test.
+ # See python/setup.py for more details
make -j2
}