X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2FMakefile;h=30bce647726ba1f7018af2b80fd46cc63ac4db3d;hb=d4abb63c052dc9d4c23ce72e498b4c7483f3b7cb;hp=115364b6645ec33e5777527d02af45f7dfc04e12;hpb=5a9f85b87615078868d3b394370a30b550186cce;p=apps%2Fagl-service-can-low-level.git

diff --git a/tests/Makefile b/tests/Makefile
index 115364b6..30bce647 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,38 +1,53 @@
 CFLAGS=-ansi -Wall -Werror -I .. -g -O0 --coverage
 LDFLAGS=--coverage
-DEPS=../pb_decode.h ../pb_encode.h ../pb.h person.h unittests.h
+DEPS=../pb_decode.h ../pb_encode.h ../pb.h person.pb.h callbacks.pb.h unittests.h unittestproto.pb.h
 TESTS=test_decode1 test_encode1 decode_unittests encode_unittests
 
 all: $(TESTS) run_unittests breakpoints
 
 clean:
-	rm -f $(TESTS) *.o *.gcda *.gcno
+	rm -f $(TESTS) person.pb* *.o *.gcda *.gcno
 
+%.o: %.c
 %.o: %.c $(DEPS)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-test_decode1: test_decode1.o ../pb_decode.o person.o
-test_encode1: test_encode1.o ../pb_encode.o person.o
-decode_unittests: decode_unittests.o ../pb_decode.o person.o
-encode_unittests: encode_unittests.o ../pb_encode.o person.o
+pb_encode.o: ../pb_encode.c $(DEPS)
+	$(CC) $(CFLAGS) -c -o $@ $<
+pb_decode.o: ../pb_decode.c $(DEPS)
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+test_decode1: test_decode1.o pb_decode.o person.pb.o
+test_encode1: test_encode1.o pb_encode.o person.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
+decode_unittests: decode_unittests.o pb_decode.o unittestproto.pb.o
+encode_unittests: encode_unittests.o pb_encode.o unittestproto.pb.o
 
-person.c person.h: person.proto
-	protoc -I. -I../generator -I/usr/include -operson.pb $<
-	python ../generator/nanopb_generator.py person.pb
+%.pb: %.proto
+	protoc -I. -I../generator -I/usr/include -o$@ $<
+
+%.pb.c %.pb.h: %.pb
+	python ../generator/nanopb_generator.py $<
 
 breakpoints: ../*.c *.c
 	grep -n 'return false;' $^ | cut -d: -f-2 | xargs -n 1 echo b > $@
 
-coverage:
-	gcov -o .. ../pb_encode.c
-	gcov -o .. ../pb_decode.c
+coverage: run_unittests
+	gcov pb_encode.gcda
+	gcov pb_decode.gcda
 
-run_unittests: decode_unittests encode_unittests test_encode1 test_decode1
+run_unittests: decode_unittests encode_unittests test_encode1 test_decode1 test_encode_callbacks test_decode_callbacks
+	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_encode_callbacks | ./test_decode_callbacks`" = \
+	"`./test_encode_callbacks | protoc --decode=TestMessage callbacks.proto`" ]
 
 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
+	bash -c 'I=1; while cat /dev/urandom | ./test_decode1 > /dev/null; do I=$$(($$I+1)); echo -en "\r$$I"; done'