From 3bcdd49eac3aabcc121173c0023834f8bcf0a3cb Mon Sep 17 00:00:00 2001
From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Fri, 3 Apr 2015 20:08:05 +0300
Subject: Always define enum long names so that cross-file references work.

Update issue 118
Status: FixedInGit
---
 tests/regression/issue_118/SConscript    | 11 +++++++++++
 tests/regression/issue_118/enumdef.proto |  6 ++++++
 tests/regression/issue_118/enumuse.proto |  5 +++++
 3 files changed, 22 insertions(+)
 create mode 100644 tests/regression/issue_118/SConscript
 create mode 100644 tests/regression/issue_118/enumdef.proto
 create mode 100644 tests/regression/issue_118/enumuse.proto

(limited to 'tests/regression')

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];
+}
-- 
cgit 1.2.3-korg