summaryrefslogtreecommitdiffstats
path: root/tests/field_size_32/SConscript
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2014-04-05 13:26:37 +0300
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2014-04-05 13:26:37 +0300
commita8de6acf2df23104be8907b9e3ed8647b33df6e2 (patch)
tree7246f8d4607220cd3e6770907699e40431519323 /tests/field_size_32/SConscript
parent7880f308ea996292d5e28a81618370d79e2bdf26 (diff)
Add rule for building coverage summary using lcov.
Also modified a few tests to be more compatible with coverage information, so that they use the same pb_encode/decode.c instead of making a copy.
Diffstat (limited to 'tests/field_size_32/SConscript')
-rw-r--r--tests/field_size_32/SConscript12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/field_size_32/SConscript b/tests/field_size_32/SConscript
index 25ef3546..2a64c6c5 100644
--- a/tests/field_size_32/SConscript
+++ b/tests/field_size_32/SConscript
@@ -5,8 +5,6 @@ Import("env")
# Take copy of the files for custom build.
c = Copy("$TARGET", "$SOURCE")
-env.Command("pb_encode.c", "#../pb_encode.c", c)
-env.Command("pb_decode.c", "#../pb_decode.c", c)
env.Command("encode_alltypes.c", "$BUILD/alltypes/encode_alltypes.c", c)
env.Command("decode_alltypes.c", "$BUILD/alltypes/decode_alltypes.c", c)
@@ -16,9 +14,15 @@ env.NanopbProto(["alltypes", "alltypes.options"])
opts = env.Clone()
opts.Append(CPPDEFINES = {'PB_FIELD_32BIT': 1})
+# Build new version of core
+strict = opts.Clone()
+strict.Append(CFLAGS = strict['CORECFLAGS'])
+strict.Object("pb_decode_fields32.o", "$NANOPB/pb_decode.c")
+strict.Object("pb_encode_fields32.o", "$NANOPB/pb_encode.c")
+
# Now build and run the test normally.
-enc = opts.Program(["encode_alltypes.c", "alltypes.pb.c", "pb_encode.c"])
-dec = opts.Program(["decode_alltypes.c", "alltypes.pb.c", "pb_decode.c"])
+enc = opts.Program(["encode_alltypes.c", "alltypes.pb.c", "pb_encode_fields32.o"])
+dec = opts.Program(["decode_alltypes.c", "alltypes.pb.c", "pb_decode_fields32.o"])
env.RunTest(enc)
env.RunTest([dec, "encode_alltypes.output"])