rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed autogenerated file naming from foo.c to foo.pb.c

Browse Source 
git-svn-id: https://svn.kapsi.fi/jpa/nanopb@965 e3a754e5-d11d-0410-8d38-ebb782a927b9
This commit is contained in:
Petteri Aimonen
2011-08-23 16:16:33 +00:00
parent 9966a8c9b6
commit 64ac18c884
8 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/Makefile
View File

@@ -1,12 +1,12 @@
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 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 $(DEPS)
$(CC) $(CFLAGS) -c -o $@ $<
@@ -16,14 +16,16 @@ pb_encode.o: ../pb_encode.c $(DEPS)
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
test_decode1: test_decode1.o pb_decode.o person.pb.o
test_encode1: test_encode1.o pb_encode.o person.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 > $@

21
tests/decode_unittests.c
View File

@@ -2,6 +2,7 @@
#include <string.h>
#include "pb_decode.h"
#include "unittests.h"
#include "unittestproto.pb.h"
#define S(x) pb_istream_from_buffer((uint8_t*)x, sizeof(x) - 1)
@@ -15,24 +16,6 @@ bool stream_callback(pb_istream_t *stream, uint8_t *buf, size_t count)
return true;
}
typedef struct { size_t data_count; int32_t data[10]; } IntegerArray;
const pb_field_t IntegerArray_fields[] = {
{1, PB_HTYPE_ARRAY | PB_LTYPE_VARINT, offsetof(IntegerArray, data),
pb_delta(IntegerArray, data_count, data),
pb_membersize(IntegerArray, data[0]),
pb_membersize(IntegerArray, data) / pb_membersize(IntegerArray, data[0])},
PB_LAST_FIELD
};
typedef struct { pb_callback_t data; } CallbackArray;
const pb_field_t CallbackArray_fields[] = {
{1, PB_HTYPE_CALLBACK | PB_LTYPE_VARINT, offsetof(CallbackArray, data),
0, pb_membersize(CallbackArray, data), 0},
PB_LAST_FIELD
};
/* Verifies that the stream passed to callback matches the byte array pointed to by arg. */
bool callback_check(pb_istream_t *stream, const pb_field_t *field, void *arg)
{
@@ -224,6 +207,8 @@ int main()
IntegerArray dest;
COMMENT("Testing pb_decode with packed int32 field")
TEST((s = S("\x0A\x00"), pb_decode(&s, IntegerArray_fields, &dest)
&& dest.data_count == 0))
TEST((s = S("\x0A\x01\x01"), pb_decode(&s, IntegerArray_fields, &dest)
&& dest.data_count == 1 && dest.data[0] == 1))
TEST((s = S("\x0A\x0A\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A"), pb_decode(&s, IntegerArray_fields, &dest)

22
tests/encode_unittests.c
View File

@@ -2,6 +2,7 @@
#include <string.h>
#include "pb_encode.h"
#include "unittests.h"
#include "unittestproto.pb.h"
bool streamcallback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
{
@@ -163,6 +164,27 @@ int main()
TEST(WRITES(pb_enc_string(&s, NULL, &value), "\x00"))
}
{
uint8_t buffer[10];
pb_ostream_t s;
IntegerArray msg = {5, {1, 2, 3, 4, 5}};
COMMENT("Test pb_encode with int32 array")
TEST(WRITES(pb_encode(&s, IntegerArray_fields, &msg), "\x0A\x05\x01\x02\x03\x04\x05"))
msg.data_count = 0;
TEST(WRITES(pb_encode(&s, IntegerArray_fields, &msg), ""))
msg.data_count = 10;
TEST(!pb_encode(&s, IntegerArray_fields, &msg))
}
{
}
if (status != 0)
fprintf(stdout, "\n\nSome tests FAILED!\n");