diff options
Diffstat (limited to 'tests/package_name/SConscript')
| -rw-r--r-- | tests/package_name/SConscript | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tests/package_name/SConscript b/tests/package_name/SConscript index 4afc503..8f1b902 100644 --- a/tests/package_name/SConscript +++ b/tests/package_name/SConscript @@ -3,16 +3,14 @@ Import("env") -def set_pkgname(src, dst, pkgname): - data = open(str(src)).read() - placeholder = '// package name placeholder' - assert placeholder in data - data = data.replace(placeholder, 'package %s;' % pkgname) - open(str(dst), 'w').write(data) - # Build a modified alltypes.proto -env.Command("alltypes.proto", "#alltypes/alltypes.proto", - lambda target, source, env: set_pkgname(source[0], target[0], 'test.package')) +def modify_proto(target, source, env): + '''Add a "package test.package;" directive to the beginning of the .proto file.''' + data = open(str(source[0]), 'r').read() + open(str(target[0]), 'w').write("package test.package;\n\n" + data) + return 0 + +env.Command("alltypes.proto", "#alltypes/alltypes.proto", modify_proto) env.Command("alltypes.options", "#alltypes/alltypes.options", Copy("$TARGET", "$SOURCE")) env.NanopbProto(["alltypes", "alltypes.options"]) @@ -31,7 +29,7 @@ def modify_c(target, source, env): env.Command("encode_alltypes.c", "#alltypes/encode_alltypes.c", modify_c) # Encode and compare results to original alltypes testcase -enc = env.Program(["encode_alltypes.c", "alltypes.pb.c", "$COMMON/pb_encode.o", "$COMMON/pb_common.o"]) +enc = env.Program(["encode_alltypes.c", "alltypes.pb.c", "$COMMON/pb_encode.o"]) refdec = "$BUILD/alltypes/decode_alltypes$PROGSUFFIX" env.RunTest(enc) env.Compare(["encode_alltypes.output", "$BUILD/alltypes/encode_alltypes.output"]) |