diff options
| author | Jens Geyer <jensg@apache.org> | 2022-06-13 23:37:25 +0200 |
|---|---|---|
| committer | Jens Geyer <jensg@apache.org> | 2022-09-05 22:04:22 +0200 |
| commit | f066d84ffb7fe2eb0dc3b7e7cd0d0417a1ae7963 (patch) | |
| tree | d47baa7d0dea62a354eb0ededf77715d6cf7aa33 /test/py | |
| parent | 3f4fa2947dc6e049e0f4748bdb6142b0c4673164 (diff) | |
| download | thrift-f066d84ffb7fe2eb0dc3b7e7cd0d0417a1ae7963.tar.gz | |
Replace ThriftTest.thrift with v0.16/ThriftTest.thrift to allow for merging the partially completed uuid implementation to master
Diffstat (limited to 'test/py')
| -rw-r--r-- | test/py/Makefile.am | 32 | ||||
| -rw-r--r-- | test/py/generate.cmake | 28 |
2 files changed, 38 insertions, 22 deletions
diff --git a/test/py/Makefile.am b/test/py/Makefile.am index 57529d733..7c78f17da 100644 --- a/test/py/Makefile.am +++ b/test/py/Makefile.am @@ -71,35 +71,51 @@ TESTS= $(py_unit_tests) gen-py/%/__init__.py: ../%.thrift $(THRIFT) - $(THRIFT) --gen py $< + test -f ../v0.16/$(notdir $<) \ + && $(THRIFT) --gen py ../v0.16/$(notdir $<) \ + || $(THRIFT) --gen py $< gen-py-default/%/__init__.py: ../%.thrift $(THRIFT) test -d gen-py-default || $(MKDIR_P) gen-py-default - $(THRIFT) --gen py -out gen-py-default $< + test -f ../v0.16/$(notdir $<) \ + && $(THRIFT) --gen py -out gen-py-default ../v0.16/$(notdir $<) \ + || $(THRIFT) --gen py -out gen-py-default $< gen-py-slots/%/__init__.py: ../%.thrift $(THRIFT) test -d gen-py-slots || $(MKDIR_P) gen-py-slots - $(THRIFT) --gen py:slots -out gen-py-slots $< + test ../v0.16/$(notdir $<) \ + && $(THRIFT) --gen py:slots -out gen-py-slots ../v0.16/$(notdir $<) \ + || $(THRIFT) --gen py:slots -out gen-py-slots $< gen-py-oldstyle/%/__init__.py: ../%.thrift $(THRIFT) test -d gen-py-oldstyle || $(MKDIR_P) gen-py-oldstyle - $(THRIFT) --gen py:old_style -out gen-py-oldstyle $< + test ../v0.16/$(notdir $<) \ + && $(THRIFT) --gen py:old_style -out gen-py-oldstyle ../v0.16/$(notdir $<) \ + || $(THRIFT) --gen py:old_style -out gen-py-oldstyle $< gen-py-no_utf8strings/%/__init__.py: ../%.thrift $(THRIFT) test -d gen-py-no_utf8strings || $(MKDIR_P) gen-py-no_utf8strings - $(THRIFT) --gen py:no_utf8strings -out gen-py-no_utf8strings $< + test ../v0.16/$(notdir $<) \ + && $(THRIFT) --gen py:no_utf8strings -out gen-py-no_utf8strings ../v0.16/$(notdir $<) \ + || $(THRIFT) --gen py:no_utf8strings -out gen-py-no_utf8strings $< gen-py-dynamic/%/__init__.py: ../%.thrift $(THRIFT) test -d gen-py-dynamic || $(MKDIR_P) gen-py-dynamic - $(THRIFT) --gen py:dynamic -out gen-py-dynamic $< + test ../v0.16/$(notdir $<) \ + && $(THRIFT) --gen py:dynamic -out gen-py-dynamic ../v0.16/$(notdir $<) \ + || $(THRIFT) --gen py:dynamic -out gen-py-dynamic $< gen-py-dynamicslots/%/__init__.py: ../%.thrift $(THRIFT) test -d gen-py-dynamicslots || $(MKDIR_P) gen-py-dynamicslots - $(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots $< + test ../v0.16/$(notdir $<) \ + && $(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots ../v0.16/$(notdir $<) \ + || $(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots $< gen-py-enum/%/__init__.py: ../%.thrift $(THRIFT) test -d gen-py-enum || $(MKDIR_P) gen-py-enum - $(THRIFT) --gen py:enum -out gen-py-enum $< + test ../v0.16/$(notdir $<) \ + && $(THRIFT) --gen py:enum -out gen-py-enum ../v0.16/$(notdir $<) \ + || $(THRIFT) --gen py:enum -out gen-py-enum $< clean-local: $(RM) -r build diff --git a/test/py/generate.cmake b/test/py/generate.cmake index e6a6735e4..eb6f11106 100644 --- a/test/py/generate.cmake +++ b/test/py/generate.cmake @@ -7,21 +7,21 @@ macro(GENERATE FILENAME GENERATOR OUTPUTDIR) endif() endmacro(GENERATE) -generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py gen-py-default) -generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:slots gen-py-slots) -generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:old_style gen-py-oldstyle) -generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:no_utf8strings gen-py-no_utf8strings) -generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:dynamic gen-py-dynamic) -generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:dynamic,slots gen-py-dynamicslots) -generate(${MY_PROJECT_DIR}/test/ThriftTest.thrift py:enum gen-py-enum) +generate(${MY_PROJECT_DIR}/test/v0.16/ThriftTest.thrift py gen-py-default) +generate(${MY_PROJECT_DIR}/test/v0.16/ThriftTest.thrift py:slots gen-py-slots) +generate(${MY_PROJECT_DIR}/test/v0.16/ThriftTest.thrift py:old_style gen-py-oldstyle) +generate(${MY_PROJECT_DIR}/test/v0.16/ThriftTest.thrift py:no_utf8strings gen-py-no_utf8strings) +generate(${MY_PROJECT_DIR}/test/v0.16/ThriftTest.thrift py:dynamic gen-py-dynamic) +generate(${MY_PROJECT_DIR}/test/v0.16/ThriftTest.thrift py:dynamic,slots gen-py-dynamicslots) +generate(${MY_PROJECT_DIR}/test/v0.16/ThriftTest.thrift py:enum gen-py-enum) -generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py gen-py-default) -generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:slots gen-py-slots) -generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:old_style gen-py-oldstyle) -generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:no_utf8strings gen-py-no_utf8strings) -generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:dynamic gen-py-dynamic) -generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:dynamic,slots gen-py-dynamicslots) -generate(${MY_PROJECT_DIR}/test/DebugProtoTest.thrift py:enum gen-py-enum) +generate(${MY_PROJECT_DIR}/test/v0.16/DebugProtoTest.thrift py gen-py-default) +generate(${MY_PROJECT_DIR}/test/v0.16/DebugProtoTest.thrift py:slots gen-py-slots) +generate(${MY_PROJECT_DIR}/test/v0.16/DebugProtoTest.thrift py:old_style gen-py-oldstyle) +generate(${MY_PROJECT_DIR}/test/v0.16/DebugProtoTest.thrift py:no_utf8strings gen-py-no_utf8strings) +generate(${MY_PROJECT_DIR}/test/v0.16/DebugProtoTest.thrift py:dynamic gen-py-dynamic) +generate(${MY_PROJECT_DIR}/test/v0.16/DebugProtoTest.thrift py:dynamic,slots gen-py-dynamicslots) +generate(${MY_PROJECT_DIR}/test/v0.16/DebugProtoTest.thrift py:enum gen-py-enum) generate(${MY_PROJECT_DIR}/test/DoubleConstantsTest.thrift py gen-py-default) generate(${MY_PROJECT_DIR}/test/DoubleConstantsTest.thrift py:slots gen-py-slots) |