Convert more test cases to scons
This commit is contained in:
Petteri Aimonen
@@ -1,77 +1,17 @@
|
|||||||
env = DefaultEnvironment()
|
env = DefaultEnvironment()
|
||||||
|
|
||||||
|
# Add the builders defined in site_init.py
|
||||||
|
add_nanopb_builders(env)
|
||||||
|
|
||||||
|
# Path to the files shared by tests, and to the nanopb core.
|
||||||
env.Append(CPPPATH = ["#../", "#common"])
|
env.Append(CPPPATH = ["#../", "#common"])
|
||||||
|
|
||||||
# Build command for building .pb from .proto using protoc
|
# Path for finding nanopb.proto
|
||||||
def proto_actions(source, target, env, for_signature):
|
env.Append(PROTOCPATH = ['#../generator', '/usr/include', '.'])
|
||||||
dirs = ' '.join(['-I' + env.GetBuildPath(d) for d in env['PROTOCPATH']])
|
|
||||||
return '$PROTOC $PROTOCFLAGS %s -o%s %s' % (dirs, target[0], source[0])
|
|
||||||
|
|
||||||
proto_file_builder = Builder(generator = proto_actions,
|
|
||||||
suffix = '.pb',
|
|
||||||
src_suffix = '.proto')
|
|
||||||
env.Append(BUILDERS = {'Proto': proto_file_builder})
|
|
||||||
env.SetDefault(PROTOC = 'protoc')
|
|
||||||
|
|
||||||
# Define the include path to find nanopb.proto
|
# Define the include path to find nanopb.proto
|
||||||
env.Append(PROTOCPATH = ['#../generator', '/usr/include', '.'])
|
env.Append(PROTOCPATH = ['#../generator', '/usr/include', '.'])
|
||||||
|
|
||||||
# Build command for running nanopb generator
|
|
||||||
import os.path
|
|
||||||
def nanopb_targets(target, source, env):
|
|
||||||
basename = os.path.splitext(str(source[0]))[0]
|
|
||||||
target.append(basename + '.pb.h')
|
|
||||||
return target, source
|
|
||||||
|
|
||||||
nanopb_file_builder = Builder(action = '$NANOPB_GENERATOR $NANOPB_FLAGS $SOURCE',
|
|
||||||
suffix = '.pb.c',
|
|
||||||
src_suffix = '.pb',
|
|
||||||
emitter = nanopb_targets)
|
|
||||||
env.Append(BUILDERS = {'Nanopb': nanopb_file_builder})
|
|
||||||
env.SetDefault(NANOPB_GENERATOR = 'python ' + env.GetBuildPath("#../generator/nanopb_generator.py"))
|
|
||||||
|
|
||||||
# Combined method to run both protoc and nanopb generator
|
|
||||||
def run_protoc_and_nanopb(env, source):
|
|
||||||
b1 = env.Proto(source)
|
|
||||||
b2 = env.Nanopb(source)
|
|
||||||
return b1 + b2
|
|
||||||
env.AddMethod(run_protoc_and_nanopb, "NanopbProto")
|
|
||||||
|
|
||||||
# Build command that runs a test program and saves the output
|
|
||||||
def run_test_actions(source, target, env, for_signature):
|
|
||||||
cmd = str(source[0]) # Name of binary
|
|
||||||
if len(source) > 1:
|
|
||||||
cmd += ' <' + str(source[1]) # Input file
|
|
||||||
cmd += ' >' + str(target[0])
|
|
||||||
return cmd
|
|
||||||
|
|
||||||
run_test_builder = Builder(generator = run_test_actions,
|
|
||||||
suffix = '.output')
|
|
||||||
env.Append(BUILDERS = {'RunTest': run_test_builder})
|
|
||||||
|
|
||||||
# Build command that decodes a message using protoc
|
|
||||||
def decode_actions(source, target, env, for_signature):
|
|
||||||
dirs = ' '.join(['-I' + env.GetBuildPath(d) for d in env['PROTOCPATH']])
|
|
||||||
return '$PROTOC $PROTOCFLAGS %s --decode=%s %s <%s >%s' % (dirs, env['MESSAGE'], source[1], source[0], target[0])
|
|
||||||
|
|
||||||
decode_builder = Builder(generator = decode_actions,
|
|
||||||
suffix = '.decoded')
|
|
||||||
env.Append(BUILDERS = {'Decode': decode_builder})
|
|
||||||
|
|
||||||
# Build command that asserts that two files be equal
|
|
||||||
def compare_files(target, source, env):
|
|
||||||
data1 = open(str(source[0]), 'rb').read()
|
|
||||||
data2 = open(str(source[1]), 'rb').read()
|
|
||||||
if data1 == data2:
|
|
||||||
# open(str(target[0]), 'w').write('OK')
|
|
||||||
return 0
|
|
||||||
else:
|
|
||||||
return "Test failed: %s and %s differ!" % (source[0], source[1])
|
|
||||||
|
|
||||||
compare_builder = Builder(action = compare_files,
|
|
||||||
suffix = '.equal')
|
|
||||||
env.Append(BUILDERS = {'Compare': compare_builder})
|
|
||||||
|
|
||||||
# Now include the SConscript files from all subdirectories
|
# Now include the SConscript files from all subdirectories
|
||||||
SConscript(Glob('*/SConscript'), exports = 'env')
|
SConscript(Glob('*/SConscript'), exports = 'env')
|
||||||
|
|
||||||
|
|||||||
12
tests/alltypes/SConscript
Normal file
12
tests/alltypes/SConscript
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
# Build and run a test that encodes and decodes a message that contains
|
||||||
|
# all of the Protocol Buffers data types.
|
||||||
|
|
||||||
|
Import("env")
|
||||||
|
|
||||||
|
env.NanopbProto("alltypes")
|
||||||
|
env.Program(["encode_alltypes.c", "alltypes.pb.c", "#common/pb_encode.o"])
|
||||||
|
env.Program(["decode_alltypes.c", "alltypes.pb.c", "#common/pb_decode.o"])
|
||||||
|
|
||||||
|
env.RunTest("encode_alltypes")
|
||||||
|
env.RunTest(["decode_alltypes", "encode_alltypes.output"])
|
||||||
|
|
||||||
20
tests/cxx_main_program/SConscript
Normal file
20
tests/cxx_main_program/SConscript
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
# Run the alltypes test case, but compile it as C++ instead.
|
||||||
|
# In fact, compile the entire nanopb using C++ compiler.
|
||||||
|
|
||||||
|
Import("env")
|
||||||
|
|
||||||
|
# Copy the files to .cxx extension in order to force C++ build.
|
||||||
|
c = Copy("$TARGET", "$SOURCE")
|
||||||
|
Command("pb_encode.cxx", "#../pb_encode.c", c)
|
||||||
|
Command("pb_decode.cxx", "#../pb_decode.c", c)
|
||||||
|
Command("alltypes.pb.h", "#alltypes/alltypes.pb.h", c)
|
||||||
|
Command("alltypes.pb.cxx", "#alltypes/alltypes.pb.c", c)
|
||||||
|
Command("encode_alltypes.cxx", "#alltypes/encode_alltypes.c", c)
|
||||||
|
Command("decode_alltypes.cxx", "#alltypes/decode_alltypes.c", c)
|
||||||
|
|
||||||
|
# Now build and run the test normally.
|
||||||
|
env.Program(["encode_alltypes.cxx", "alltypes.pb.cxx", "pb_encode.cxx"])
|
||||||
|
env.Program(["decode_alltypes.cxx", "alltypes.pb.cxx", "pb_decode.cxx"])
|
||||||
|
|
||||||
|
env.RunTest("encode_alltypes")
|
||||||
|
env.RunTest(["decode_alltypes", "encode_alltypes.output"])
|
||||||
86
tests/site_scons/site_init.py
Normal file
86
tests/site_scons/site_init.py
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
|
||||||
|
def add_nanopb_builders(env):
|
||||||
|
'''Add the necessary builder commands for nanopb tests.'''
|
||||||
|
|
||||||
|
# Build command for building .pb from .proto using protoc
|
||||||
|
def proto_actions(source, target, env, for_signature):
|
||||||
|
dirs = ' '.join(['-I' + env.GetBuildPath(d) for d in env['PROTOCPATH']])
|
||||||
|
return '$PROTOC $PROTOCFLAGS %s -o%s %s' % (dirs, target[0], source[0])
|
||||||
|
|
||||||
|
proto_file_builder = Builder(generator = proto_actions,
|
||||||
|
suffix = '.pb',
|
||||||
|
src_suffix = '.proto')
|
||||||
|
env.Append(BUILDERS = {'Proto': proto_file_builder})
|
||||||
|
env.SetDefault(PROTOC = 'protoc')
|
||||||
|
|
||||||
|
# Build command for running nanopb generator
|
||||||
|
import os.path
|
||||||
|
def nanopb_targets(target, source, env):
|
||||||
|
basename = os.path.splitext(str(source[0]))[0]
|
||||||
|
target.append(basename + '.pb.h')
|
||||||
|
return target, source
|
||||||
|
|
||||||
|
nanopb_file_builder = Builder(action = '$NANOPB_GENERATOR $NANOPB_FLAGS $SOURCE',
|
||||||
|
suffix = '.pb.c',
|
||||||
|
src_suffix = '.pb',
|
||||||
|
emitter = nanopb_targets)
|
||||||
|
env.Append(BUILDERS = {'Nanopb': nanopb_file_builder})
|
||||||
|
env.SetDefault(NANOPB_GENERATOR = 'python ' + env.GetBuildPath("#../generator/nanopb_generator.py"))
|
||||||
|
env.SetDefault(NANOPB_FLAGS = '-q')
|
||||||
|
|
||||||
|
# Combined method to run both protoc and nanopb generator
|
||||||
|
def run_protoc_and_nanopb(env, source):
|
||||||
|
b1 = env.Proto(source)
|
||||||
|
b2 = env.Nanopb(source)
|
||||||
|
return b1 + b2
|
||||||
|
env.AddMethod(run_protoc_and_nanopb, "NanopbProto")
|
||||||
|
|
||||||
|
# Build command that runs a test program and saves the output
|
||||||
|
def run_test(target, source, env):
|
||||||
|
if len(source) > 1:
|
||||||
|
infile = open(str(source[1]))
|
||||||
|
else:
|
||||||
|
infile = None
|
||||||
|
|
||||||
|
pipe = subprocess.Popen(str(source[0]),
|
||||||
|
stdin = infile,
|
||||||
|
stdout = open(str(target[0]), 'w'),
|
||||||
|
stderr = sys.stderr)
|
||||||
|
result = pipe.wait()
|
||||||
|
if result == 0:
|
||||||
|
print '\033[92m[ OK ]\033[0m Ran ' + str(source[0])
|
||||||
|
else:
|
||||||
|
print '\033[91m[FAIL]\033[0m Program ' + str(source[0]) + ' returned ' + str(result)
|
||||||
|
return result
|
||||||
|
|
||||||
|
run_test_builder = Builder(action = run_test,
|
||||||
|
suffix = '.output')
|
||||||
|
env.Append(BUILDERS = {'RunTest': run_test_builder})
|
||||||
|
|
||||||
|
# Build command that decodes a message using protoc
|
||||||
|
def decode_actions(source, target, env, for_signature):
|
||||||
|
dirs = ' '.join(['-I' + env.GetBuildPath(d) for d in env['PROTOCPATH']])
|
||||||
|
return '$PROTOC $PROTOCFLAGS %s --decode=%s %s <%s >%s' % (dirs, env['MESSAGE'], source[1], source[0], target[0])
|
||||||
|
|
||||||
|
decode_builder = Builder(generator = decode_actions,
|
||||||
|
suffix = '.decoded')
|
||||||
|
env.Append(BUILDERS = {'Decode': decode_builder})
|
||||||
|
|
||||||
|
# Build command that asserts that two files be equal
|
||||||
|
def compare_files(target, source, env):
|
||||||
|
data1 = open(str(source[0]), 'rb').read()
|
||||||
|
data2 = open(str(source[1]), 'rb').read()
|
||||||
|
if data1 == data2:
|
||||||
|
print '\033[92m[ OK ]\033[0m Files equal: ' + str(source[0]) + ' and ' + str(source[1])
|
||||||
|
return 0
|
||||||
|
else:
|
||||||
|
print '\033[91m[FAIL]\033[0m Files differ: ' + str(source[0]) + ' and ' + str(source[1])
|
||||||
|
return 1
|
||||||
|
|
||||||
|
compare_builder = Builder(action = compare_files,
|
||||||
|
suffix = '.equal')
|
||||||
|
env.Append(BUILDERS = {'Compare': compare_builder})
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user