diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-17 18:50:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 18:50:04 -0700 |
| commit | d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e (patch) | |
| tree | 6224f98ad30e99dc2d896423853892f2142f16ed /python/tox.ini | |
| parent | 22503a01722939385a7584c3b65f1c43dc5b2ef8 (diff) | |
| parent | 8356d270a54e18c21f4feac6f5e2b6f1061dc8d5 (diff) | |
| download | protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.gz protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.bz2 protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.zip | |
Merge pull request #4924 from xfxyjwf/3.6.x
Cherry-pick master build fixes and kokoro changes to 3.6.x
Diffstat (limited to 'python/tox.ini')
| -rw-r--r-- | python/tox.ini | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/tox.ini b/python/tox.ini index 38a81b4f..4eb319d2 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -4,7 +4,8 @@ envlist = [testenv] usedevelop=true -passenv = CC +passenv = + CC KOKORO_BUILD_ID KOKORO_BUILD_NUMBER setenv = cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs cpp: DYLD_LIBRARY_PATH={toxinidir}/../src/.libs |