Only a few tests updated so far. Have to include all the rest before merging to mainline.
Update issue 63
Status: Started
*.pb
*~
*.tar.gz
+.sconsign.dblite
julkaisu.txt
docs/*.html
docs/generator_flow.png
example_unions/decode
example_unions/encode
generator/nanopb_pb2.pyc
-tests/decode_unittests
-tests/encode_unittests
-tests/test_compiles
-tests/test_decode1
-tests/test_decode2
-tests/test_decode3
-tests/test_decode3_buf
-tests/test_decode_callbacks
-tests/test_encode1
-tests/test_encode2
-tests/test_encode3
-tests/test_encode3_buf
-tests/test_encode_callbacks
-tests/test_missing_fields
-tests/test_multiple_files
-tests/bc_decode
-tests/bc_encode
-tests/breakpoints
-
-CFLAGS=-ansi -Wall -Werror -I .. -g -O0
-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_decode3_buf \
- test_encode1 test_encode2 test_encode3 test_encode3_buf \
- test_decode_callbacks test_encode_callbacks \
- test_missing_fields test_no_messages test_funny_name \
- test_multiple_files test_cxxcompile test_options \
- bc_encode bc_decode test_encode_extensions test_decode_extensions
-
-# More strict checks for the core part of nanopb
-CC_VERSION=$(shell $(CC) -v 2>&1)
-CFLAGS_CORE=
-ifneq (,$(findstring gcc,$(CC_VERSION)))
- CFLAGS_CORE=-pedantic -Wextra -Wcast-qual -Wlogical-op -Wconversion
- CFLAGS+=--coverage -fstack-protector-all
- LDFLAGS+=--coverage
-endif
-ifneq (,$(findstring clang,$(CC_VERSION)))
- CFLAGS_CORE=-pedantic -Wextra -Wcast-qual -Wconversion
-endif
-
-# Also use mudflap if it is available
-# To enable, run with make -B USE_MUDFLAP=y
-USE_MUDFLAP ?= n
-ifeq ($(USE_MUDFLAP),y)
- CFLAGS += -fmudflap
- LDFLAGS += -lmudflap -fmudflap
-endif
-
-all: breakpoints $(TESTS) run_unittests
+all:
+ scons
clean:
- rm -f $(TESTS) person.pb* alltypes.pb* *.o *.gcda *.gcno *.pb.h *.pb.c
-
-%.pb.o: %.pb.c %.pb.h
- $(CC) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
-
-%.o: %.c
-%.o: %.c $(DEPS)
- $(CC) $(CFLAGS) -c -o $@ $<
-
-pb_encode.o: ../pb_encode.c $(DEPS)
- $(CC) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
-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
-test_decode3: test_decode3.o pb_decode.o alltypes.pb.o
-test_encode1: test_encode1.o pb_encode.o person.pb.o
-test_encode2: test_encode2.o pb_encode.o person.pb.o
-test_encode3: test_encode3.o pb_encode.o alltypes.pb.o
-test_multiple_files: test_multiple_files.o pb_encode.o callbacks2.pb.o callbacks.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
-test_missing_fields: test_missing_fields.o pb_encode.o pb_decode.o missing_fields.pb.o
-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
-test_funny_name: funny-proto+name.pb.h funny-proto+name.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
-test_encode_extensions: test_encode_extensions.c pb_encode.o alltypes.pb.o extensions.pb.o
-test_decode_extensions: test_decode_extensions.c pb_decode.o alltypes.pb.o extensions.pb.o
-
-%.pb: %.proto
- protoc -I. -I../generator -I/usr/include -o$@ $<
-
-%.pb.c %.pb.h: %.pb ../generator/nanopb_generator.py
- python ../generator/nanopb_generator.py $<
-
-breakpoints: ../*.c *.c
- grep -n 'return false;' $^ | cut -d: -f-2 | xargs -n 1 echo b > $@
-
-coverage: run_unittests
- gcov pb_encode.gcda
- gcov pb_decode.gcda
-
-run_unittests: $(TESTS)
- 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_encode2 | ./test_decode1`" = \
- "`./test_encode2 | protoc --decode=Person -I. -I../generator -I/usr/include person.proto`" ]
-
- [ "`./test_encode2 | ./test_decode2`" = \
- "`./test_encode2 | protoc --decode=Person -I. -I../generator -I/usr/include person.proto`" ]
-
- [ "`./test_decode2 < person_with_extra_field.pb`" = \
- "`./test_encode2 | ./test_decode2`" ]
-
- [ "`./test_encode_callbacks | ./test_decode_callbacks`" = \
- "`./test_encode_callbacks | protoc --decode=TestMessage callbacks.proto`" ]
-
- ./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
- ./test_decode3 < alltypes_with_extra_fields.pb
- ./bc_encode | ./bc_decode
- ./test_encode_extensions | ./test_decode_extensions
-
- ./test_missing_fields
-
-test_options: options.pb.h options.expected options.pb.o
- cat options.expected | while read -r p; do \
- if ! grep -q "$$p" $<; then \
- echo Expected: "$$p"; \
- exit 1; \
- fi \
- done
+ scons -c
-run_fuzztest: test_decode3
- bash -c 'ulimit -c unlimited; I=1; while true; do cat /dev/urandom | ./test_decode3 > /dev/null; I=$$(($$I+1)); echo -en "\r$$I"; done'
--- /dev/null
+env = DefaultEnvironment()
+
+env.Append(CPPPATH = ["#../", "#common"])
+
+# Build command for building .pb from .proto using protoc
+def proto_actions(source, target, env, for_signature):
+ dirs = ' '.join(['-I' + env.GetBuildPath(d) for d in env['PROTOCPATH']])
+ return '$PROTOC $PROTOCFLAGS %s -o%s %s' % (dirs, target[0], source[0])
+
+proto_file_builder = Builder(generator = proto_actions,
+ suffix = '.pb',
+ src_suffix = '.proto')
+env.Append(BUILDERS = {'Proto': proto_file_builder})
+env.SetDefault(PROTOC = 'protoc')
+
+# Define the include path to find nanopb.proto
+env.Append(PROTOCPATH = ['#../generator', '/usr/include', '.'])
+
+# Build command for running nanopb generator
+import os.path
+def nanopb_targets(target, source, env):
+ basename = os.path.splitext(str(source[0]))[0]
+ target.append(basename + '.pb.h')
+ return target, source
+
+nanopb_file_builder = Builder(action = '$NANOPB_GENERATOR $NANOPB_FLAGS $SOURCE',
+ suffix = '.pb.c',
+ src_suffix = '.pb',
+ emitter = nanopb_targets)
+env.Append(BUILDERS = {'Nanopb': nanopb_file_builder})
+env.SetDefault(NANOPB_GENERATOR = 'python ' + env.GetBuildPath("#../generator/nanopb_generator.py"))
+
+# Combined method to run both protoc and nanopb generator
+def run_protoc_and_nanopb(env, source):
+ b1 = env.Proto(source)
+ b2 = env.Nanopb(source)
+ return b1 + b2
+env.AddMethod(run_protoc_and_nanopb, "NanopbProto")
+
+# Build command that runs a test program and saves the output
+def run_test_actions(source, target, env, for_signature):
+ cmd = str(source[0]) # Name of binary
+ if len(source) > 1:
+ cmd += ' <' + str(source[1]) # Input file
+ cmd += ' >' + str(target[0])
+ return cmd
+
+run_test_builder = Builder(generator = run_test_actions,
+ suffix = '.output')
+env.Append(BUILDERS = {'RunTest': run_test_builder})
+
+# Build command that decodes a message using protoc
+def decode_actions(source, target, env, for_signature):
+ dirs = ' '.join(['-I' + env.GetBuildPath(d) for d in env['PROTOCPATH']])
+ return '$PROTOC $PROTOCFLAGS %s --decode=%s %s <%s >%s' % (dirs, env['MESSAGE'], source[1], source[0], target[0])
+
+decode_builder = Builder(generator = decode_actions,
+ suffix = '.decoded')
+env.Append(BUILDERS = {'Decode': decode_builder})
+
+# Build command that asserts that two files be equal
+def compare_files(target, source, env):
+ data1 = open(str(source[0]), 'rb').read()
+ data2 = open(str(source[1]), 'rb').read()
+ if data1 == data2:
+# open(str(target[0]), 'w').write('OK')
+ return 0
+ else:
+ return "Test failed: %s and %s differ!" % (source[0], source[1])
+
+compare_builder = Builder(action = compare_files,
+ suffix = '.equal')
+env.Append(BUILDERS = {'Compare': compare_builder})
+
+# Now include the SConscript files from all subdirectories
+SConscript(Glob('*/SConscript'), exports = 'env')
+
--- /dev/null
+# Build and run a basic round-trip test using memory buffer encoding.
+
+Import("env")
+
+env.Program(["encode_buffer.c", "#common/person.pb.c", "#common/pb_encode.o"])
+env.Program(["decode_buffer.c", "#common/person.pb.c", "#common/pb_decode.o"])
+
+env.RunTest("encode_buffer")
+env.RunTest(["decode_buffer", "encode_buffer.output"])
+env.Decode(["encode_buffer.output", "#common/person.proto"], MESSAGE = "Person")
+env.Compare(["decode_buffer.output", "encode_buffer.decoded"])
+
--- /dev/null
+# Build the common files needed by multiple test cases
+
+Import('env')
+
+# Protocol definitions for the encode/decode_unittests
+env.NanopbProto("unittestproto")
+
+# Protocol definitions for basic_buffer/stream tests
+env.NanopbProto("person")
+
+# Binaries of the pb_decode.c and pb_encode.c
+env.Object("pb_decode.o", "#../pb_decode.c")
+env.Object("pb_encode.o", "#../pb_encode.c")
+
--- /dev/null
+Import('env')
+env.Program(["decode_unittests.c", "#common/unittestproto.pb.c", "#common/pb_decode.o"])
+env.RunTest('decode_unittests')
+
--- /dev/null
+# Build and run the stand-alone unit tests for the nanopb encoder part.
+
+Import('env')
+env.Program(["encode_unittests.c", "#common/unittestproto.pb.c", "#common/pb_encode.o"])
+env.RunTest('encode_unittests')
--- /dev/null
+message SubMessage {
+ optional string stringvalue = 1;
+ repeated int32 int32value = 2;
+ repeated fixed32 fixed32value = 3;
+ repeated fixed64 fixed64value = 4;
+}
+
+message TestMessage {
+ optional string stringvalue = 1;
+ repeated int32 int32value = 2;
+ repeated fixed32 fixed32value = 3;
+ repeated fixed64 fixed64value = 4;
+ optional SubMessage submsg = 5;
+ repeated string repeatedstring = 6;
+}
+
+++ /dev/null
-
-\vTest Person\107\1a\11foobar@foobar.com"\10
-\f555-12345678\10\ 2
\ No newline at end of file