X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Falltypes%2FSConscript;h=6c6238c681e440c215baa2b4c40726258a6ce6e3;hb=a641e21b34aed824b6b919f7ab9937eaadf09473;hp=3c8adc482f5bbfeea369556c18a0d0bb20694f52;hpb=4dccf28ba9c212b232147fd3823554d04b30c392;p=apps%2Fagl-service-can-low-level.git

diff --git a/tests/alltypes/SConscript b/tests/alltypes/SConscript
index 3c8adc48..6c6238c6 100644
--- a/tests/alltypes/SConscript
+++ b/tests/alltypes/SConscript
@@ -3,10 +3,33 @@
 
 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.NanopbProto(["alltypes", "alltypes.options"])
+enc = env.Program(["encode_alltypes.c", "alltypes.pb.c", "$COMMON/pb_encode.o", "$COMMON/pb_common.o"])
+dec = env.Program(["decode_alltypes.c", "alltypes.pb.c", "$COMMON/pb_decode.o", "$COMMON/pb_common.o"])
+
+# Test the round-trip from nanopb encoder to nanopb decoder
+env.RunTest(enc)
+env.RunTest([dec, "encode_alltypes.output"])
+
+# Re-encode the data using protoc, and check that the results from nanopb
+# match byte-per-byte to the protoc output.
+env.Decode("encode_alltypes.output.decoded",
+           ["encode_alltypes.output", "alltypes.proto"],
+           MESSAGE='AllTypes')
+env.Encode("encode_alltypes.output.recoded",
+           ["encode_alltypes.output.decoded", "alltypes.proto"],
+           MESSAGE='AllTypes')
+env.Compare(["encode_alltypes.output", "encode_alltypes.output.recoded"])
+
+# Do the same checks with the optional fields present.
+env.RunTest("optionals.output", enc, ARGS = ['1'])
+env.RunTest("optionals.decout", [dec, "optionals.output"], ARGS = ['1'])
+env.Decode("optionals.output.decoded",
+           ["optionals.output", "alltypes.proto"],
+           MESSAGE='AllTypes')
+env.Encode("optionals.output.recoded",
+           ["optionals.output.decoded", "alltypes.proto"],
+           MESSAGE='AllTypes')
+env.Compare(["optionals.output", "optionals.output.recoded"])
 
-env.RunTest("encode_alltypes")
-env.RunTest(["decode_alltypes", "encode_alltypes.output"])