diff options
| -rw-r--r-- | tests/SConstruct | 7 | ||||
| -rw-r--r-- | tests/oneof/SConscript | 35 |
2 files changed, 27 insertions, 15 deletions
diff --git a/tests/SConstruct b/tests/SConstruct index 9c222daa..61ce0c37 100644 --- a/tests/SConstruct +++ b/tests/SConstruct @@ -72,6 +72,13 @@ if not env.GetOption('clean'): else: conf.env.Append(PROTOCPATH = '/usr/include') + # Check protoc version + status, output = conf.TryAction('protoc --version') + if status: + conf.env.Append(PROTOC_VERSION = output) + else: + conf.env.Append(PROTOC_VERSION = "") + # Check if libmudflap is available (only with GCC) if 'gcc' in env['CC']: if conf.CheckLib('mudflap'): diff --git a/tests/oneof/SConscript b/tests/oneof/SConscript index 19845278..95f451cb 100644 --- a/tests/oneof/SConscript +++ b/tests/oneof/SConscript @@ -2,21 +2,26 @@ Import('env') -env.NanopbProto('oneof') +import re +version = re.search('([0-9]+).([0-9]+).([0-9]+)', 'libprotoc 3.0.0').groups() -enc = env.Program(['encode_oneof.c', - 'oneof.pb.c', - '$COMMON/pb_encode.o', - '$COMMON/pb_common.o']) +# Oneof is supported by protoc >= 2.6.0 +if int(version[0]) > 2 or (int(version[0]) == 2 and int(version[1]) >= 6): + env.NanopbProto('oneof') -dec = env.Program(['decode_oneof.c', - 'oneof.pb.c', - '$COMMON/pb_decode.o', - '$COMMON/pb_common.o']) + enc = env.Program(['encode_oneof.c', + 'oneof.pb.c', + '$COMMON/pb_encode.o', + '$COMMON/pb_common.o']) -env.RunTest("message1.pb", enc, ARGS = ['1']) -env.RunTest("message1.txt", [dec, 'message1.pb'], ARGS = ['1']) -env.RunTest("message2.pb", enc, ARGS = ['2']) -env.RunTest("message2.txt", [dec, 'message2.pb'], ARGS = ['2']) -env.RunTest("message3.pb", enc, ARGS = ['3']) -env.RunTest("message3.txt", [dec, 'message3.pb'], ARGS = ['3']) + dec = env.Program(['decode_oneof.c', + 'oneof.pb.c', + '$COMMON/pb_decode.o', + '$COMMON/pb_common.o']) + + env.RunTest("message1.pb", enc, ARGS = ['1']) + env.RunTest("message1.txt", [dec, 'message1.pb'], ARGS = ['1']) + env.RunTest("message2.pb", enc, ARGS = ['2']) + env.RunTest("message2.txt", [dec, 'message2.pb'], ARGS = ['2']) + env.RunTest("message3.pb", enc, ARGS = ['3']) + env.RunTest("message3.txt", [dec, 'message3.pb'], ARGS = ['3']) |