X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2FMakefile;h=638309995f248f5799963cb2ec2099c274e84317;hb=b9baec6b4c3a04136ea0430109bc7bc1eda12685;hp=84c035e56676a2b66b4564bd30e8aacc8ea954b5;hpb=0c5bc4caf9cfb221822fead442b462be2f47b97b;p=apps%2Fagl-service-can-low-level.git

diff --git a/tests/Makefile b/tests/Makefile
index 84c035e5..63830999 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,18 +1,114 @@
 CFLAGS=-ansi -Wall -Werror -I .. -g -O0
-DEPS=../pb_decode.c ../pb_decode.h ../pb_encode.c ../pb_encode.h ../pb.h person.h unittests.h
-TESTS=test_decode1 test_encode1 decode_unittests encode_unittests
+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=  decode_unittests encode_unittests \
+	test_decode1 test_decode2 test_decode3 \
+	test_encode1 test_encode2 test_encode3 \
+	test_decode_callbacks test_encode_callbacks \
+	test_missing_fields test_no_messages \
+	test_multiple_files test_cxxcompile test_options \
+	bc_encode bc_decode
 
-all: $(TESTS) run_unittests
+# More strict checks for the core part of nanopb
+CC_VERSION=$(shell $(CC) -v 2>&1)
+CFLAGS_CORE=
+ifneq (,$(findstring gcc,$(CC_VERSION)))
+	CFLAGS_CORE=-pedantic -Wextra -Wcast-qual -Wlogical-op -Wconversion
+        CFLAGS+=--coverage
+        LDFLAGS+=--coverage
+endif
+ifneq (,$(findstring clang,$(CC_VERSION)))
+	CFLAGS_CORE=-pedantic -Wextra -Wcast-qual -Wconversion
+endif
+
+all: breakpoints $(TESTS) run_unittests
 
 clean:
-	rm -f $(TESTS)
+	rm -f $(TESTS) person.pb* alltypes.pb* *.o *.gcda *.gcno *.pb.h *.pb.c
+
+%.pb.o: %.pb.c %.pb.h
+	$(CC) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
+
+%.o: %.c
+%.o: %.c $(DEPS)
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+pb_encode.o: ../pb_encode.c $(DEPS)
+	$(CC) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
+pb_decode.o: ../pb_decode.c $(DEPS)
+	$(CC) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
+
+pb_encode.cxx.o: ../pb_encode.c $(DEPS)
+	$(CXX) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
+pb_decode.cxx.o: ../pb_decode.c $(DEPS)
+	$(CXX) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
+
+test_cxxcompile: pb_encode.cxx.o pb_decode.cxx.o
+test_decode1: test_decode1.o pb_decode.o person.pb.o
+test_decode2: test_decode2.o pb_decode.o person.pb.o
+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_multiple_files: test_multiple_files.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
+decode_unittests: decode_unittests.o pb_decode.o unittestproto.pb.o
+encode_unittests: encode_unittests.o pb_encode.o unittestproto.pb.o
+test_no_messages: no_messages.pb.h no_messages.pb.c no_messages.pb.o
+bc_encode: bc_alltypes.pb.o pb_encode.o bc_encode.o
+bc_decode: bc_alltypes.pb.o pb_decode.o bc_decode.o
+
+%.pb: %.proto
+	protoc -I. -I../generator -I/usr/include -o$@ $<
+
+%.pb.c %.pb.h: %.pb ../generator/nanopb_generator.py
+	python ../generator/nanopb_generator.py $<
+
+breakpoints: ../*.c *.c
+	grep -n 'return false;' $^ | cut -d: -f-2 | xargs -n 1 echo b > $@
+
+coverage: run_unittests
+	gcov pb_encode.gcda
+	gcov pb_decode.gcda
+
+run_unittests: $(TESTS)
+	rm -f *.gcda
+	
+	./decode_unittests > /dev/null
+	./encode_unittests > /dev/null
+	
+	[ "`./test_encode1 | ./test_decode1`" = \
+	"`./test_encode1 | protoc --decode=Person -I. -I../generator -I/usr/include person.proto`" ]
+
+	[ "`./test_encode2 | ./test_decode1`" = \
+	"`./test_encode2 | protoc --decode=Person -I. -I../generator -I/usr/include person.proto`" ]
+
+	[ "`./test_encode2 | ./test_decode2`" = \
+	"`./test_encode2 | protoc --decode=Person -I. -I../generator -I/usr/include person.proto`" ]
+	
+	[ "`./test_decode2 < person_with_extra_field.pb`" = \
+	"`./test_encode2 | ./test_decode2`" ]
+	
+	[ "`./test_encode_callbacks | ./test_decode_callbacks`" = \
+	"`./test_encode_callbacks | protoc --decode=TestMessage callbacks.proto`" ]
 
-%: %.c $(DEPS)
-	$(CC) $(CFLAGS) -o $@ $< ../pb_decode.c ../pb_encode.c
+	./test_encode3 | ./test_decode3
+	./test_encode3 1 | ./test_decode3 1
+	./test_encode3 1 | protoc --decode=AllTypes -I. -I../generator -I/usr/include alltypes.proto >/dev/null
+	./bc_encode | ./bc_decode
+	
+	./test_missing_fields
 
-run_unittests: decode_unittests encode_unittests
-	./decode_unittests
-	./encode_unittests
+test_options: options.pb.h options.expected options.pb.o
+	cat options.expected | while read -r p; do \
+	    if ! grep -q "$$p" $<; then \
+	        echo Expected: "$$p"; \
+	        exit 1; \
+	    fi \
+	done
 
-run_fuzztest: test_decode1
-	bash -c 'I=1; while cat /dev/urandom | ./test_decode1 > /dev/null; do I=$$(($$I+1)); echo -en "\r$$I"; done'
\ No newline at end of file
+run_fuzztest: test_decode2
+	bash -c 'I=1; while true; do cat /dev/urandom | ./test_decode2 > /dev/null; I=$$(($$I+1)); echo -en "\r$$I"; done'