rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only run oneof test when protoc >= 2.6 is available

Browse Source
This commit is contained in:
Petteri Aimonen
2015-01-04 20:00:37 +02:00
parent 77a71ceb6d
commit 7135e2797a
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/SConstruct
View File

@@ -72,6 +72,13 @@ if not env.GetOption('clean'):
else: else:
conf.env.Append(PROTOCPATH = '/usr/include') 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) # Check if libmudflap is available (only with GCC)
if 'gcc' in env['CC']: if 'gcc' in env['CC']:
if conf.CheckLib('mudflap'): if conf.CheckLib('mudflap'):

35
tests/oneof/SConscript
View File

@@ -2,21 +2,26 @@
Import('env') 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 is supported by protoc >= 2.6.0
'oneof.pb.c', if int(version[0]) > 2 or (int(version[0]) == 2 and int(version[1]) >= 6):
'$COMMON/pb_encode.o', env.NanopbProto('oneof')
'$COMMON/pb_common.o'])
dec = env.Program(['decode_oneof.c', enc = env.Program(['encode_oneof.c',
'oneof.pb.c', 'oneof.pb.c',
'$COMMON/pb_decode.o', '$COMMON/pb_encode.o',
'$COMMON/pb_common.o']) '$COMMON/pb_common.o'])
env.RunTest("message1.pb", enc, ARGS = ['1']) dec = env.Program(['decode_oneof.c',
env.RunTest("message1.txt", [dec, 'message1.pb'], ARGS = ['1']) 'oneof.pb.c',
env.RunTest("message2.pb", enc, ARGS = ['2']) '$COMMON/pb_decode.o',
env.RunTest("message2.txt", [dec, 'message2.pb'], ARGS = ['2']) '$COMMON/pb_common.o'])
env.RunTest("message3.pb", enc, ARGS = ['3'])
env.RunTest("message3.txt", [dec, 'message3.pb'], ARGS = ['3']) 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'])