Update changelog for 0.2.8

[apps/agl-service-can-low-level.git] / tests / cxx_main_program / SConscript

diff --git a/tests/cxx_main_program/SConscript b/tests/cxx_main_program/SConscript
index b548231..e78c6b3 100644 (file)
--- a/tests/cxx_main_program/SConscript
+++ b/tests/cxx_main_program/SConscript
@@ -3,18 +3,22 @@
 
 Import("env")
 
+# This is needed to get INT32_MIN etc. macros defined
+env = env.Clone()
+env.Append(CPPDEFINES = ['__STDC_LIMIT_MACROS'])
+
 # Copy the files to .cxx extension in order to force C++ build.
 c = Copy("$TARGET", "$SOURCE")
-Command("pb_encode.cxx", "#../pb_encode.c", c)
-Command("pb_decode.cxx", "#../pb_decode.c", c)
-Command("alltypes.pb.h", "#alltypes/alltypes.pb.h", c)
-Command("alltypes.pb.cxx", "#alltypes/alltypes.pb.c", c)
-Command("encode_alltypes.cxx", "#alltypes/encode_alltypes.c", c)
-Command("decode_alltypes.cxx", "#alltypes/decode_alltypes.c", c)
+env.Command("pb_encode.cxx", "#../pb_encode.c", c)
+env.Command("pb_decode.cxx", "#../pb_decode.c", c)
+env.Command("alltypes.pb.h", "$BUILD/alltypes/alltypes.pb.h", c)
+env.Command("alltypes.pb.cxx", "$BUILD/alltypes/alltypes.pb.c", c)
+env.Command("encode_alltypes.cxx", "$BUILD/alltypes/encode_alltypes.c", c)
+env.Command("decode_alltypes.cxx", "$BUILD/alltypes/decode_alltypes.c", c)
 
 # Now build and run the test normally.
-env.Program(["encode_alltypes.cxx", "alltypes.pb.cxx", "pb_encode.cxx"])
-env.Program(["decode_alltypes.cxx", "alltypes.pb.cxx", "pb_decode.cxx"])
+enc = env.Program(["encode_alltypes.cxx", "alltypes.pb.cxx", "pb_encode.cxx"])
+dec = env.Program(["decode_alltypes.cxx", "alltypes.pb.cxx", "pb_decode.cxx"])
 
-env.RunTest("encode_alltypes")
-env.RunTest(["decode_alltypes", "encode_alltypes.output"])
+env.RunTest(enc)
+env.RunTest([dec, "encode_alltypes.output"])