X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Falltypes_pointer%2FSConscript;h=05b4e52d8b1845e89a67a3577fdd5ce3ff693a92;hb=bf61d2337b4107b2c37c35bb41c7b809d8f3feb9;hp=b0e35042604225f2f229e2f464178a89f58862c2;hpb=4ae3b2e5661b154cd1f7e545f6052d271306ff25;p=apps%2Fagl-service-can-low-level.git

diff --git a/tests/alltypes_pointer/SConscript b/tests/alltypes_pointer/SConscript
index b0e35042..05b4e52d 100644
--- a/tests/alltypes_pointer/SConscript
+++ b/tests/alltypes_pointer/SConscript
@@ -1,12 +1,31 @@
-# Build and run a test that encodes and decodes a message that contains
-# all of the Protocol Buffers data types.
+# Encode the AllTypes message using pointers for all fields, and verify the
+# output against the normal AllTypes test case.
 
 Import("env")
 
+# We need our own pb_decode.o for the malloc support
+strict = env.Clone()
+strict.Append(CFLAGS = strict['CORECFLAGS'])
+strict.Append(CPPDEFINES = {'PB_ENABLE_MALLOC': 1});
+strict.Object("pb_decode_with_malloc.o", "$NANOPB/pb_decode.c")
+
+c = Copy("$TARGET", "$SOURCE")
+env.Command("alltypes.proto", "#alltypes/alltypes.proto", c)
+
 env.NanopbProto(["alltypes", "alltypes.options"])
 enc = env.Program(["encode_alltypes_pointer.c", "alltypes.pb.c", "$COMMON/pb_encode.o"])
-# dec = env.Program(["decode_alltypes_pointer.c", "alltypes.pb.c", "$COMMON/pb_decode.o"])
+dec = env.Program(["decode_alltypes_pointer.c", "alltypes.pb.c", "pb_decode_with_malloc.o"])
 
+refdec = "$BUILD/alltypes/decode_alltypes$PROGSUFFIX"
+
+# Encode and compare results
 env.RunTest(enc)
-# env.RunTest([dec, "encode_alltypes.output"])
+env.RunTest("decode_alltypes.output", [dec, "encode_alltypes_pointer.output"])
+env.RunTest("decode_alltypes_ref.output", [refdec, "encode_alltypes_pointer.output"])
+env.Compare(["encode_alltypes_pointer.output", "$BUILD/alltypes/encode_alltypes.output"])
+
+# Do the same thing with the optional fields present
+env.RunTest("optionals.output", enc, ARGS = ['1'])
+env.RunTest("optionals.decout", [refdec, "optionals.output"], ARGS = ['1'])
+env.Compare(["optionals.output", "$BUILD/alltypes/optionals.output"])