summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2017-02-25 17:14:39 +0200
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2017-02-25 17:14:39 +0200
commitb5abefc25d033f7e12e369f5c664f1f0efaf398b (patch)
treeca2ad5314b0f03e4d6a5a8849be4a9502ae371dc
parentd7fae92bbefbd01c7093bd1712a2dab114118034 (diff)
Windows build fix
-rw-r--r--tests/alltypes_callback/SConscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/alltypes_callback/SConscript b/tests/alltypes_callback/SConscript
index 1cef3972..8be53908 100644
--- a/tests/alltypes_callback/SConscript
+++ b/tests/alltypes_callback/SConscript
@@ -22,6 +22,7 @@ env.RunTest("optionals.refdecout", [refdec, "optionals.output"], ARGS = ['1'])
env.RunTest("optionals.decout", [dec, "optionals.output"], ARGS = ['1'])
# Try with malloc support also
-mallocbin = malloc_env.Object("decode_with_malloc.o", "decode_alltypes_callback.c")
-mallocdec = malloc_env.Program("decode_with_malloc", [mallocbin, "alltypes.pb.o", "$COMMON/pb_decode_with_malloc.o", "$COMMON/pb_common_with_malloc.o", "$COMMON/malloc_wrappers.o"])
+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"])