From b9e1b4435a406a8a27c078ea05dee1240e51704a Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 2 May 2017 18:29:37 +0200 Subject: Added external libraries from openXC CMake files. Now libraries are cleanly included and built. Change-Id: Iaa85639578b55b2da8357bc438426403e2cca8de Signed-off-by: Romain Forlot --- CAN-binder/libs/nanopb/tests/extra_fields/SConscript | 16 ---------------- .../tests/extra_fields/alltypes_with_extra_fields.pb | Bin 523 -> 0 bytes .../tests/extra_fields/person_with_extra_field.expected | 14 -------------- .../tests/extra_fields/person_with_extra_field.pb | Bin 124 -> 0 bytes 4 files changed, 30 deletions(-) delete mode 100644 CAN-binder/libs/nanopb/tests/extra_fields/SConscript delete mode 100644 CAN-binder/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb delete mode 100644 CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.expected delete mode 100644 CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.pb (limited to 'CAN-binder/libs/nanopb/tests/extra_fields') diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/SConscript b/CAN-binder/libs/nanopb/tests/extra_fields/SConscript deleted file mode 100644 index 75ac5c5..0000000 --- a/CAN-binder/libs/nanopb/tests/extra_fields/SConscript +++ /dev/null @@ -1,16 +0,0 @@ -# Test that the decoder properly handles unknown fields in the input. - -Import("env") - -dec = env.GetBuildPath('$BUILD/basic_buffer/${PROGPREFIX}decode_buffer${PROGSUFFIX}') -env.RunTest('person_with_extra_field.output', [dec, "person_with_extra_field.pb"]) -env.Compare(["person_with_extra_field.output", "person_with_extra_field.expected"]) - -dec = env.GetBuildPath('$BUILD/basic_stream/${PROGPREFIX}decode_stream${PROGSUFFIX}') -env.RunTest('person_with_extra_field_stream.output', [dec, "person_with_extra_field.pb"]) -env.Compare(["person_with_extra_field_stream.output", "person_with_extra_field.expected"]) - -# This uses the backwards compatibility alltypes test, so that -# alltypes_with_extra_fields.pb doesn't have to be remade so often. -dec2 = env.GetBuildPath('$BUILD/backwards_compatibility/${PROGPREFIX}decode_legacy${PROGSUFFIX}') -env.RunTest('alltypes_with_extra_fields.output', [dec2, 'alltypes_with_extra_fields.pb']) diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb b/CAN-binder/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb deleted file mode 100644 index f9f5394..0000000 Binary files a/CAN-binder/libs/nanopb/tests/extra_fields/alltypes_with_extra_fields.pb and /dev/null differ diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.expected b/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.expected deleted file mode 100644 index da9c32d..0000000 --- a/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.expected +++ /dev/null @@ -1,14 +0,0 @@ -name: "Test Person 99" -id: 99 -email: "test@person.com" -phone { - number: "555-12345678" - type: MOBILE -} -phone { - number: "99-2342" -} -phone { - number: "1234-5678" - type: WORK -} diff --git a/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.pb b/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.pb deleted file mode 100644 index ffb303d..0000000 Binary files a/CAN-binder/libs/nanopb/tests/extra_fields/person_with_extra_field.pb and /dev/null differ -- cgit 1.2.3-korg