From b9e1b4435a406a8a27c078ea05dee1240e51704a Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
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 <romain.forlot@iot.bzh>
---
 .../libs/nanopb/tests/basic_buffer/SConscript      | 12 ---
 .../libs/nanopb/tests/basic_buffer/decode_buffer.c | 88 ----------------------
 .../libs/nanopb/tests/basic_buffer/encode_buffer.c | 38 ----------
 3 files changed, 138 deletions(-)
 delete mode 100644 CAN-binder/libs/nanopb/tests/basic_buffer/SConscript
 delete mode 100644 CAN-binder/libs/nanopb/tests/basic_buffer/decode_buffer.c
 delete mode 100644 CAN-binder/libs/nanopb/tests/basic_buffer/encode_buffer.c

(limited to 'CAN-binder/libs/nanopb/tests/basic_buffer')

diff --git a/CAN-binder/libs/nanopb/tests/basic_buffer/SConscript b/CAN-binder/libs/nanopb/tests/basic_buffer/SConscript
deleted file mode 100644
index acaf5ffa..00000000
--- a/CAN-binder/libs/nanopb/tests/basic_buffer/SConscript
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build and run a basic round-trip test using memory buffer encoding.
-
-Import("env")
-
-enc = env.Program(["encode_buffer.c", "$COMMON/person.pb.c", "$COMMON/pb_encode.o", "$COMMON/pb_common.o"])
-dec = env.Program(["decode_buffer.c", "$COMMON/person.pb.c", "$COMMON/pb_decode.o", "$COMMON/pb_common.o"])
-
-env.RunTest(enc)
-env.RunTest([dec, "encode_buffer.output"])
-env.Decode(["encode_buffer.output", "$COMMON/person.proto"], MESSAGE = "Person")
-env.Compare(["decode_buffer.output", "encode_buffer.decoded"])
-
diff --git a/CAN-binder/libs/nanopb/tests/basic_buffer/decode_buffer.c b/CAN-binder/libs/nanopb/tests/basic_buffer/decode_buffer.c
deleted file mode 100644
index 291d164c..00000000
--- a/CAN-binder/libs/nanopb/tests/basic_buffer/decode_buffer.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* A very simple decoding test case, using person.proto.
- * Produces output compatible with protoc --decode.
- * Reads the encoded data from stdin and prints the values
- * to stdout as text.
- *
- * Run e.g. ./test_encode1 | ./test_decode1
- */
-
-#include <stdio.h>
-#include <pb_decode.h>
-#include "person.pb.h"
-#include "test_helpers.h"
-
-/* This function is called once from main(), it handles
-   the decoding and printing. */
-bool print_person(pb_istream_t *stream)
-{
-    int i;
-    Person person = Person_init_zero;
-    
-    if (!pb_decode(stream, Person_fields, &person))
-        return false;
-    
-    /* Now the decoding is done, rest is just to print stuff out. */
-
-    printf("name: \"%s\"\n", person.name);
-    printf("id: %ld\n", (long)person.id);
-    
-    if (person.has_email)
-        printf("email: \"%s\"\n", person.email);
-    
-    for (i = 0; i < person.phone_count; i++)
-    {
-        Person_PhoneNumber *phone = &person.phone[i];
-        printf("phone {\n");
-        printf("  number: \"%s\"\n", phone->number);
-        
-        if (phone->has_type)
-        {
-            switch (phone->type)
-            {
-                case Person_PhoneType_WORK:
-                    printf("  type: WORK\n");
-                    break;
-                
-                case Person_PhoneType_HOME:
-                    printf("  type: HOME\n");
-                    break;
-                
-                case Person_PhoneType_MOBILE:
-                    printf("  type: MOBILE\n");
-                    break;
-            }
-        }
-        printf("}\n");
-    }
-    
-    return true;
-}
-
-int main()
-{
-    uint8_t buffer[Person_size];
-    pb_istream_t stream;
-    size_t count;
-    
-    /* Read the data into buffer */
-    SET_BINARY_MODE(stdin);
-    count = fread(buffer, 1, sizeof(buffer), stdin);
-    
-    if (!feof(stdin))
-    {
-    	printf("Message does not fit in buffer\n");
-    	return 1;
-    }
-    
-    /* Construct a pb_istream_t for reading from the buffer */
-    stream = pb_istream_from_buffer(buffer, count);
-    
-    /* Decode and print out the stuff */
-    if (!print_person(&stream))
-    {
-        printf("Parsing failed: %s\n", PB_GET_ERROR(&stream));
-        return 1;
-    } else {
-        return 0;
-    }
-}
diff --git a/CAN-binder/libs/nanopb/tests/basic_buffer/encode_buffer.c b/CAN-binder/libs/nanopb/tests/basic_buffer/encode_buffer.c
deleted file mode 100644
index c412c14e..00000000
--- a/CAN-binder/libs/nanopb/tests/basic_buffer/encode_buffer.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* A very simple encoding test case using person.proto.
- * Just puts constant data in the fields and encodes into
- * buffer, which is then written to stdout.
- */
-
-#include <stdio.h>
-#include <pb_encode.h>
-#include "person.pb.h"
-#include "test_helpers.h"
-
-int main()
-{
-    uint8_t buffer[Person_size];
-    pb_ostream_t stream;
-    
-    /* Initialize the structure with constants */
-    Person person = {"Test Person 99", 99, true, "test@person.com",
-        3, {{"555-12345678", true, Person_PhoneType_MOBILE},
-            {"99-2342", false, 0},
-            {"1234-5678", true, Person_PhoneType_WORK},
-        }};
-
-    stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
-    
-    /* Now encode it and check if we succeeded. */
-    if (pb_encode(&stream, Person_fields, &person))
-    {    
-        /* Write the result data to stdout */
-        SET_BINARY_MODE(stdout);
-        fwrite(buffer, 1, stream.bytes_written, stdout);
-        return 0; /* Success */
-    }
-    else
-    {
-        fprintf(stderr, "Encoding failed: %s\n", PB_GET_ERROR(&stream));
-        return 1; /* Failure */
-    }
-}
-- 
cgit 1.2.3-korg