diff options
| author |   Steffen Siering <steffen siering gmail com> | 2012-11-11 22:48:21 +0000 |
|---|---|---|
| committer |   Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2012-11-16 09:24:39 +0200 |
| commit | cc29958d34e43ed889536ad4a723fce819544785 (patch) | |
| tree | 73517c9d9d1679560207702ebd7ff831f707c471 /tests/Makefile | |
| parent | 0abb764b1816e6a986c10c30444530e11d112cb1 (diff) | |
Fix STATIC_ASSERT macro when using multiple .proto files.
The __COUNTER__ macro (used for generating unique names) is at least supported
by gcc, clang and Visual Studio. With this change test_compiles.c is
compilable, since no more typedefs are redefined.
Compilers/Preprocessors not supporting __COUNTER__ error's are still possible
which are hopfully handled by the usage of __LINE__ in most sittuations.
Added unit test for the problem.
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 1f2be716..f3a64d14 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,7 +1,9 @@ CFLAGS=-ansi -Wall -Werror -I .. -g -O0 --coverage LDFLAGS=--coverage -DEPS=../pb_decode.h ../pb_encode.h ../pb.h person.pb.h callbacks.pb.h unittests.h unittestproto.pb.h alltypes.pb.h missing_fields.pb.h +DEPS=../pb_decode.h ../pb_encode.h ../pb.h person.pb.h callbacks2.pb.h callbacks.pb.h unittests.h unittestproto.pb.h alltypes.pb.h missing_fields.pb.h TESTS=test_decode1 test_encode1 decode_unittests encode_unittests test_no_messages +TESTS=test_decode1 test_encode1 decode_unittests encode_unittests test_no_messages test_compiles + # More strict checks for the core part of nanopb CFLAGS_CORE=-pedantic -Wextra -Wcast-qual -Wlogical-op -Wconversion @@ -35,6 +37,7 @@ test_decode3: test_decode3.o pb_decode.o alltypes.pb.o test_encode1: test_encode1.o pb_encode.o person.pb.o test_encode2: test_encode2.o pb_encode.o person.pb.o test_encode3: test_encode3.o pb_encode.o alltypes.pb.o +test_compiles: test_compiles.o pb_encode.o callbacks2.pb.o callbacks.pb.o test_decode_callbacks: test_decode_callbacks.o pb_decode.o callbacks.pb.o test_encode_callbacks: test_encode_callbacks.o pb_encode.o callbacks.pb.o test_missing_fields: test_missing_fields.o pb_encode.o pb_decode.o missing_fields.pb.o @@ -55,7 +58,7 @@ coverage: run_unittests gcov pb_encode.gcda gcov pb_decode.gcda -run_unittests: decode_unittests encode_unittests test_cxxcompile test_encode1 test_encode2 test_encode3 test_decode1 test_decode2 test_decode3 test_encode_callbacks test_decode_callbacks test_missing_fields test_options +run_unittests: decode_unittests encode_unittests test_cxxcompile test_compiles test_encode1 test_encode2 test_encode3 test_decode1 test_decode2 test_decode3 test_encode_callbacks test_decode_callbacks test_missing_fields test_options rm -f *.gcda ./decode_unittests > /dev/null |