summaryrefslogtreecommitdiffstats
path: root/tests/multiple_files
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2013-09-10 22:34:54 +0300
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2013-09-10 22:34:54 +0300
commite2e9980627810fe0ee2b8f119bcf651f0f318a8a (patch)
tree686898756925aa02c3ef3be45bcfe8eb10fd4abb /tests/multiple_files
parent0bbcb7b367998063637ee35c5d13716492cbf6a3 (diff)
Move the rest of the tests to scons
Diffstat (limited to 'tests/multiple_files')
-rw-r--r--tests/multiple_files/SConscript13
-rw-r--r--tests/multiple_files/test_multiple_files.c3
2 files changed, 14 insertions, 2 deletions
diff --git a/tests/multiple_files/SConscript b/tests/multiple_files/SConscript
new file mode 100644
index 00000000..6b4f6b69
--- /dev/null
+++ b/tests/multiple_files/SConscript
@@ -0,0 +1,13 @@
+# Test that multiple .proto files don't cause name collisions.
+
+Import("env")
+
+incpath = env.Clone()
+incpath.Append(PROTOCPATH = '#multiple_files')
+
+incpath.NanopbProto("callbacks")
+incpath.NanopbProto("callbacks2")
+test = incpath.Program(["test_multiple_files.c", "callbacks.pb.c", "callbacks2.pb.c"])
+
+env.RunTest(test)
+
diff --git a/tests/multiple_files/test_multiple_files.c b/tests/multiple_files/test_multiple_files.c
index cb4e16d3..05722dc5 100644
--- a/tests/multiple_files/test_multiple_files.c
+++ b/tests/multiple_files/test_multiple_files.c
@@ -1,6 +1,5 @@
/*
- * Tests if still compile if typedefs are redfefined in STATIC_ASSERTS when
- * proto file includes another poto file
+ * Tests if this still compiles when multiple .proto files are involved.
*/
#include <stdio.h>