diff options
Diffstat (limited to 'tests/alltypes_callback/SConscript')
-rw-r--r-- | tests/alltypes_callback/SConscript | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/alltypes_callback/SConscript b/tests/alltypes_callback/SConscript index 8be5390..71b0160 100644 --- a/tests/alltypes_callback/SConscript +++ b/tests/alltypes_callback/SConscript @@ -1,13 +1,13 @@ # Test the AllTypes encoding & decoding using callbacks for all fields. -Import("env", "malloc_env") +Import("env") c = Copy("$TARGET", "$SOURCE") env.Command("alltypes.proto", "#alltypes/alltypes.proto", c) env.NanopbProto(["alltypes", "alltypes.options"]) -enc = env.Program(["encode_alltypes_callback.c", "alltypes.pb.c", "$COMMON/pb_encode.o", "$COMMON/pb_common.o"]) -dec = env.Program(["decode_alltypes_callback.c", "alltypes.pb.c", "$COMMON/pb_decode.o", "$COMMON/pb_common.o"]) +enc = env.Program(["encode_alltypes_callback.c", "alltypes.pb.c", "$COMMON/pb_encode.o"]) +dec = env.Program(["decode_alltypes_callback.c", "alltypes.pb.c", "$COMMON/pb_decode.o"]) refdec = "$BUILD/alltypes/decode_alltypes$PROGSUFFIX" @@ -21,8 +21,3 @@ env.RunTest("optionals.output", enc, ARGS = ['1']) env.RunTest("optionals.refdecout", [refdec, "optionals.output"], ARGS = ['1']) env.RunTest("optionals.decout", [dec, "optionals.output"], ARGS = ['1']) -# Try with malloc support also -mallocbin1 = malloc_env.Object("decode_with_malloc.o", "decode_alltypes_callback.c") -mallocbin2 = malloc_env.Object("alltypes_malloc.pb.o", "alltypes.pb.c") -mallocdec = malloc_env.Program("decode_with_malloc", [mallocbin1, mallocbin2, "$COMMON/pb_decode_with_malloc.o", "$COMMON/pb_common_with_malloc.o", "$COMMON/malloc_wrappers.o"]) -env.RunTest("decode_with_malloc.output", [mallocdec, "encode_alltypes_callback.output"]) |