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

diff --git a/tests/Makefile b/tests/Makefile
index 30bce647..cee6bf67 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,53 +1,21 @@
-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
-TESTS=test_decode1 test_encode1 decode_unittests encode_unittests
-
-all: $(TESTS) run_unittests breakpoints
+all:
+	scons
 
 clean:
-	rm -f $(TESTS) person.pb* *.o *.gcda *.gcno
-
-%.o: %.c
-%.o: %.c $(DEPS)
-	$(CC) $(CFLAGS) -c -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
-
-%.pb: %.proto
-	protoc -I. -I../generator -I/usr/include -o$@ $<
+	scons -c
 
-%.pb.c %.pb.h: %.pb
-	python ../generator/nanopb_generator.py $<
+coverage:
+	rm -rf build coverage
 
-breakpoints: ../*.c *.c
-	grep -n 'return false;' $^ | cut -d: -f-2 | xargs -n 1 echo b > $@
+	# LCOV does not like the newer gcov format
+	scons CC=gcc-4.6 CXX=gcc-4.6
 
-coverage: run_unittests
-	gcov pb_encode.gcda
-	gcov pb_decode.gcda
+	# Collect the data
+	mkdir build/coverage
+	lcov --base-directory . --directory build/ --gcov-tool gcov-4.6 -c -o build/coverage/nanopb.info
 
-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`" ]
+	# Remove the test code from results
+	lcov -r build/coverage/nanopb.info '*tests*' -o build/coverage/nanopb.info
 
-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'
+	# Generate HTML
+	genhtml -o build/coverage build/coverage/nanopb.info