From 32e25cbca210a359b09768537b6f443fe90a3070 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 20 Jun 2017 10:24:05 +0000 Subject: Separation Generator to a dedicated repo Change-Id: Id94831651c3266861435272a6e36c7884bef2c45 Signed-off-by: Romain Forlot --- .../libs/nanopb/tests/multiple_files/SConscript | 16 ---------- .../nanopb/tests/multiple_files/multifile1.options | 1 - .../nanopb/tests/multiple_files/multifile1.proto | 34 ---------------------- .../nanopb/tests/multiple_files/multifile2.proto | 22 -------------- .../tests/multiple_files/subdir/multifile2.proto | 25 ---------------- .../tests/multiple_files/test_multiple_files.c | 30 ------------------- 6 files changed, 128 deletions(-) delete mode 100644 CAN-binder/libs/nanopb/tests/multiple_files/SConscript delete mode 100644 CAN-binder/libs/nanopb/tests/multiple_files/multifile1.options delete mode 100644 CAN-binder/libs/nanopb/tests/multiple_files/multifile1.proto delete mode 100644 CAN-binder/libs/nanopb/tests/multiple_files/multifile2.proto delete mode 100644 CAN-binder/libs/nanopb/tests/multiple_files/subdir/multifile2.proto delete mode 100644 CAN-binder/libs/nanopb/tests/multiple_files/test_multiple_files.c (limited to 'CAN-binder/libs/nanopb/tests/multiple_files') diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/SConscript b/CAN-binder/libs/nanopb/tests/multiple_files/SConscript deleted file mode 100644 index b1281e1..0000000 --- a/CAN-binder/libs/nanopb/tests/multiple_files/SConscript +++ /dev/null @@ -1,16 +0,0 @@ -# Test that multiple .proto files don't cause name collisions. - -Import("env") - -incpath = env.Clone() -incpath.Append(PROTOCPATH = '#multiple_files') -incpath.Append(CPPPATH = '$BUILD/multiple_files') - -incpath.NanopbProto(["multifile1", "multifile1.options"]) -incpath.NanopbProto("multifile2") -incpath.NanopbProto("subdir/multifile2") -test = incpath.Program(["test_multiple_files.c", "multifile1.pb.c", - "multifile2.pb.c", "subdir/multifile2.pb.c"]) - -env.RunTest(test) - diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.options b/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.options deleted file mode 100644 index c44d266..0000000 --- a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.options +++ /dev/null @@ -1 +0,0 @@ -StaticMessage.repint32 max_count:5 diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.proto b/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.proto deleted file mode 100644 index 18f2c67..0000000 --- a/CAN-binder/libs/nanopb/tests/multiple_files/multifile1.proto +++ /dev/null @@ -1,34 +0,0 @@ -syntax = "proto2"; - -message SubMessage { - optional string stringvalue = 1; - repeated int32 int32value = 2; - repeated fixed32 fixed32value = 3; - repeated fixed64 fixed64value = 4; -} - -message TestMessage { - optional string stringvalue = 1; - repeated int32 int32value = 2; - repeated fixed32 fixed32value = 3; - repeated fixed64 fixed64value = 4; - optional SubMessage submsg = 5; - repeated string repeatedstring = 6; -} - -message StaticMessage { - repeated fixed32 repint32 = 1; -} - -enum SignedEnum { - SE_MIN = -128; - SE_MAX = 127; -} - -enum UnsignedEnum { - UE_MIN = 0; - UE_MAX = 255; -} - - - diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/multifile2.proto b/CAN-binder/libs/nanopb/tests/multiple_files/multifile2.proto deleted file mode 100644 index 4af45fd..0000000 --- a/CAN-binder/libs/nanopb/tests/multiple_files/multifile2.proto +++ /dev/null @@ -1,22 +0,0 @@ -// Test if including generated header file for this file + implicit include of -// multifile2.pb.h still compiles. Used with test_compiles.c. -syntax = "proto2"; - -import "multifile1.proto"; - -message Callback2Message { - required TestMessage tstmsg = 1; - required SubMessage submsg = 2; -} - -message OneofMessage { - oneof msgs { - StaticMessage tstmsg = 1; - } -} - -message Enums { - required SignedEnum senum = 1; - required UnsignedEnum uenum = 2; -} - diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/subdir/multifile2.proto b/CAN-binder/libs/nanopb/tests/multiple_files/subdir/multifile2.proto deleted file mode 100644 index 847a929..0000000 --- a/CAN-binder/libs/nanopb/tests/multiple_files/subdir/multifile2.proto +++ /dev/null @@ -1,25 +0,0 @@ -syntax = "proto2"; - -package subdir; - -import "multifile1.proto"; - -message Callback2Message { - required TestMessage tstmsg = 1; - required SubMessage submsg = 2; -} - -message OneofMessage { - oneof msgs { - StaticMessage tstmsg = 1; - } -} - -message Enums { - required SignedEnum senum = 1; - required UnsignedEnum uenum = 2; -} - -message SubdirMessage { - required int32 foo = 1 [default = 15]; -} diff --git a/CAN-binder/libs/nanopb/tests/multiple_files/test_multiple_files.c b/CAN-binder/libs/nanopb/tests/multiple_files/test_multiple_files.c deleted file mode 100644 index 70a3e59..0000000 --- a/CAN-binder/libs/nanopb/tests/multiple_files/test_multiple_files.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Tests if this still compiles when multiple .proto files are involved. - */ - -#include -#include -#include "unittests.h" -#include "multifile2.pb.h" -#include "subdir/multifile2.pb.h" - -int main() -{ - int status = 0; - - /* Test that included file options are properly loaded */ - TEST(OneofMessage_size == 27); - - /* Check that enum signedness is detected properly */ - TEST(PB_LTYPE(Enums_fields[0].type) == PB_LTYPE_VARINT); - TEST(PB_LTYPE(Enums_fields[1].type) == PB_LTYPE_UVARINT); - - /* Test that subdir file is correctly included */ - { - subdir_SubdirMessage foo = subdir_SubdirMessage_init_default; - TEST(foo.foo == 15); - /* TEST(subdir_OneofMessage_size == 27); */ /* TODO: Issue #172 */ - } - - return status; -} -- cgit 1.2.3-korg