Always define enum long names so that cross-file references work.

Update issue 118
Status: FixedInGit

3 files changed, 22 insertions, 0 deletions

diff --git a/tests/regression/issue_118/SConscript b/tests/regression/issue_118/SConscript
new file mode 100644
index 00000000..c90e8497
--- /dev/null
+++ b/tests/regression/issue_118/SConscript
@@ -0,0 +1,11 @@
+# Regression test for Issue 118: Short enum names in imported proto files are not honoured
+
+Import("env")
+env.Append(PROTOCPATH = "#regression/issue_118")
+
+env.NanopbProto("enumdef")
+env.Object('enumdef.pb.c')
+
+env.NanopbProto(["enumuse", "enumdef.proto"])
+env.Object('enumuse.pb.c')
+
diff --git a/tests/regression/issue_118/enumdef.proto b/tests/regression/issue_118/enumdef.proto
new file mode 100644
index 00000000..830d2988
--- /dev/null
+++ b/tests/regression/issue_118/enumdef.proto
@@ -0,0 +1,6 @@
+import 'nanopb.proto';
+
+enum MyEnum {
+	option (nanopb_enumopt).long_names = false;
+	FOOBAR = 1;
+}
diff --git a/tests/regression/issue_118/enumuse.proto b/tests/regression/issue_118/enumuse.proto
new file mode 100644
index 00000000..d778fb8f
--- /dev/null
+++ b/tests/regression/issue_118/enumuse.proto
@@ -0,0 +1,5 @@
+import 'enumdef.proto';
+
+message MyMessage {
+	required MyEnum myenum = 1 [default = FOOBAR];
+}