X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2FMakefile;h=3c4e0b048cdcd1280e5b519e69d58e72b88ff9ad;hb=eaa3c7b157ffd2a308dfc6d35d79309a9aacbcef;hp=38bdb25f1ac4a314d36dcccfcb636a38315239a2;hpb=5490163200131e4d2af9676f22d13a611ed2b7b3;p=apps%2Fagl-service-can-low-level.git

diff --git a/tests/Makefile b/tests/Makefile
index 38bdb25f..3c4e0b04 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,45 +1,21 @@
-CFLAGS=-ansi -Wall -Werror -I .. -g -O0 --coverage
-LDFLAGS=--coverage
-DEPS=../pb_decode.h ../pb_encode.h ../pb.h person.h unittests.h
-TESTS=test_decode1 test_encode1 decode_unittests encode_unittests
-
-all: $(TESTS) run_unittests breakpoints
+all:
+	scons
 
 clean:
-	rm -f $(TESTS) *.o *.gcda *.gcno
-
-%.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.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
+	scons -c
 
-person.c person.h: person.proto
-	protoc -I. -I../generator -I/usr/include -operson.pb $<
-	python ../generator/nanopb_generator.py person.pb
+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
+	# We are only interested in pb_encode.o and pb_decode.o
+	find build -name '*.gcda' -and \! \( -name '*pb_encode*' -or -name '*pb_decode*' \) -exec rm '{}' \;
 
-run_unittests: decode_unittests encode_unittests test_encode1 test_decode1
-	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`" ]
+	# Collect the data
+	mkdir build/coverage
+	lcov --base-directory . --directory build/ --gcov-tool gcov-4.6 -c -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'
\ No newline at end of file
+	# Generate HTML
+	genhtml -o build/coverage build/coverage/nanopb.info