From 42e1e2abef8c49efffaa55c645b04bb7e4184cc8 Mon Sep 17 00:00:00 2001 From: Jie Luo Date: Mon, 30 Jan 2017 15:23:35 -0800 Subject: Fix python compatibility test when a new generated code imports an old version(2.6.1 or older) generated code. --- python/compatibility_tests/v2.5.0/test.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'python/compatibility_tests') diff --git a/python/compatibility_tests/v2.5.0/test.sh b/python/compatibility_tests/v2.5.0/test.sh index c640da80..78c16ad1 100755 --- a/python/compatibility_tests/v2.5.0/test.sh +++ b/python/compatibility_tests/v2.5.0/test.sh @@ -92,16 +92,10 @@ python setup.py test # Test A.3: # proto set 1: use old version # proto set 2 which may import protos in set 1: use new version -# Compatiblility test fail if the old verison is less than 3.0.0-alpha-1. -# Because module name aliases was added in v3.0.0-alpha-1 instead of -# fully-qualified module names to refer to dependencies: dot was replaced -# with _dot_. -if [ "$(printf "$OLD_VERSION\n3.0.0" | sort -V | head -n 1 )" = "3.0.0" ]; then - cp old_protoc protoc_1 - cp ../../../src/protoc protoc_2 - python setup.py build - python setup.py test -fi +cp old_protoc protoc_1 +cp ../../../src/protoc protoc_2 +python setup.py build +python setup.py test rm google -r -f rm build -r -f -- cgit v1.2.3