X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2FMakefile;h=38f10eae58d184dbaa8bf048dea435c7d1e7d854;hb=4ba6a3027d7a5d8c17abeb031622389f8be234fe;hp=58b84a3b41f6a8013a50f0c3a0ac346726319968;hpb=1f8fb1f1ed3dbb606241db191bc3c0b5683fd4a8;p=apps%2Fagl-service-can-low-level.git

diff --git a/tests/Makefile b/tests/Makefile
index 58b84a3b..38f10eae 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,11 +3,12 @@ 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_decode1 test_decode2 test_decode3 test_decode3_buf \
+	test_encode1 test_encode2 test_encode3 test_encode3_buf \
 	test_decode_callbacks test_encode_callbacks \
 	test_missing_fields test_no_messages \
-	test_multiple_files test_cxxcompile test_options
+	test_multiple_files test_cxxcompile test_options \
+	bc_encode bc_decode
 
 # More strict checks for the core part of nanopb
 CC_VERSION=$(shell $(CC) -v 2>&1)
@@ -38,11 +39,26 @@ pb_encode.o: ../pb_encode.c $(DEPS)
 pb_decode.o: ../pb_decode.c $(DEPS)
 	$(CC) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
 
+# Test for compilability with c++ compiler
+
 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 for PB_BUF_ONLY compilation option
+
+pb_encode.buf.o: ../pb_encode.c $(DEPS)
+	$(CC) -DPB_BUFFER_ONLY $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
+pb_decode.buf.o: ../pb_decode.c $(DEPS)
+	$(CC) -DPB_BUFFER_ONLY $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
+%.buf.o: %.c $(DEPS)
+	$(CC) -DPB_BUFFER_ONLY $(CFLAGS) -c -o $@ $<	
+test_encode3_buf: test_encode3.buf.o pb_encode.buf.o alltypes.pb.o
+	$(CC) $(LDFLAGS) $^ -o $@
+test_decode3_buf: test_decode3.buf.o pb_decode.buf.o alltypes.pb.o
+	$(CC) $(LDFLAGS) $^ -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
@@ -57,6 +73,8 @@ test_missing_fields: test_missing_fields.o pb_encode.o pb_decode.o missing_field
 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$@ $<
@@ -95,6 +113,8 @@ run_unittests: $(TESTS)
 	./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
+	./test_encode3_buf 1 | ./test_decode3_buf 1
+	./bc_encode | ./bc_decode
 	
 	./test_missing_fields