diff options
Diffstat (limited to 'tests/field_size_16')
| -rw-r--r-- | tests/field_size_16/SConscript | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/field_size_16/SConscript b/tests/field_size_16/SConscript index 15dc0f5d..8fee0049 100644 --- a/tests/field_size_16/SConscript +++ b/tests/field_size_16/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_16BIT': 1}) +# Build new version of core +strict = opts.Clone() +strict.Append(CFLAGS = strict['CORECFLAGS']) +strict.Object("pb_decode_fields16.o", "$NANOPB/pb_decode.c") +strict.Object("pb_encode_fields16.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_fields16.o"]) +dec = opts.Program(["decode_alltypes.c", "alltypes.pb.c", "pb_decode_fields16.o"]) env.RunTest(enc) env.RunTest([dec, "encode_alltypes.output"]) |