summaryrefslogtreecommitdiffstats
path: root/CAN-binder/libs/nanopb/tests/regression/issue_172
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-19 16:20:02 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-19 16:20:02 +0200
commit2d574dc77f68ecb5150016989900860e8b74be50 (patch)
treed691a8345a58dcd080131c58d028f77df51a45ed /CAN-binder/libs/nanopb/tests/regression/issue_172
parent48a2605965af1f05ba7f01f6e8c1758a4c9b0522 (diff)
parent278ffb890e3d8722e4c7d824baaf221a1e375fc4 (diff)
Add 'CAN-binder/libs/nanopb/' from commit '278ffb890e3d8722e4c7d824baaf221a1e375fc4'
git-subtree-dir: CAN-binder/libs/nanopb git-subtree-mainline: 48a2605965af1f05ba7f01f6e8c1758a4c9b0522 git-subtree-split: 278ffb890e3d8722e4c7d824baaf221a1e375fc4
Diffstat (limited to 'CAN-binder/libs/nanopb/tests/regression/issue_172')
-rw-r--r--CAN-binder/libs/nanopb/tests/regression/issue_172/SConscript16
-rw-r--r--CAN-binder/libs/nanopb/tests/regression/issue_172/msg_size.c9
-rw-r--r--CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.options1
-rw-r--r--CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto4
-rw-r--r--CAN-binder/libs/nanopb/tests/regression/issue_172/test.proto6
5 files changed, 36 insertions, 0 deletions
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/SConscript b/CAN-binder/libs/nanopb/tests/regression/issue_172/SConscript
new file mode 100644
index 00000000..49c919e8
--- /dev/null
+++ b/CAN-binder/libs/nanopb/tests/regression/issue_172/SConscript
@@ -0,0 +1,16 @@
+# Verify that _size define is generated for messages that have
+# includes from another directory.
+
+Import('env')
+
+incpath = env.Clone()
+incpath.Append(PROTOCPATH="#regression/issue_172/submessage")
+incpath.Append(CPPPATH="$BUILD/regression/issue_172/submessage")
+incpath.NanopbProto('test')
+incpath.NanopbProto(['submessage/submessage', 'submessage/submessage.options'])
+
+p = incpath.Program(["msg_size.c",
+ "test.pb.c",
+ "submessage/submessage.pb.c"])
+
+
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/msg_size.c b/CAN-binder/libs/nanopb/tests/regression/issue_172/msg_size.c
new file mode 100644
index 00000000..be45acb4
--- /dev/null
+++ b/CAN-binder/libs/nanopb/tests/regression/issue_172/msg_size.c
@@ -0,0 +1,9 @@
+#include "test.pb.h"
+
+PB_STATIC_ASSERT(testmessage_size >= 1+1+1+1+16, TESTMESSAGE_SIZE_IS_WRONG)
+
+int main()
+{
+ return 0;
+}
+
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.options b/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.options
new file mode 100644
index 00000000..12fb1984
--- /dev/null
+++ b/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.options
@@ -0,0 +1 @@
+submessage.data max_size: 16
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto b/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto
new file mode 100644
index 00000000..ce6804af
--- /dev/null
+++ b/CAN-binder/libs/nanopb/tests/regression/issue_172/submessage/submessage.proto
@@ -0,0 +1,4 @@
+syntax = "proto2";
+message submessage {
+ required bytes data = 1;
+}
diff --git a/CAN-binder/libs/nanopb/tests/regression/issue_172/test.proto b/CAN-binder/libs/nanopb/tests/regression/issue_172/test.proto
new file mode 100644
index 00000000..fbd97be5
--- /dev/null
+++ b/CAN-binder/libs/nanopb/tests/regression/issue_172/test.proto
@@ -0,0 +1,6 @@
+syntax = "proto2";
+import "submessage.proto";
+
+message testmessage {
+ optional submessage sub = 1;
+}