1 files changed, 6 insertions, 66 deletions
diff --git a/tests/SConstruct b/tests/SConstruct
index 0ec1e54..b2d524c 100644
--- a/tests/SConstruct
+++ b/tests/SConstruct
@@ -1,77 +1,17 @@
 env = DefaultEnvironment()
 
-env.Append(CPPPATH = ["#../", "#common"])
+# Add the builders defined in site_init.py
+add_nanopb_builders(env)
 
-# 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])
+# Path to the files shared by tests, and to the nanopb core.
+env.Append(CPPPATH = ["#../", "#common"])
 
-proto_file_builder = Builder(generator = proto_actions,
-                             suffix = '.pb',
-                             src_suffix = '.proto')
-env.Append(BUILDERS = {'Proto': proto_file_builder})
-env.SetDefault(PROTOC = 'protoc')
+# Path for finding nanopb.proto
+env.Append(PROTOCPATH = ['#../generator', '/usr/include', '.'])
 
 # Define the include path to find nanopb.proto
 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
 SConscript(Glob('*/SConscript'), exports = 'env')