summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2015-06-18 12:20:33 -0700
committerJosh Haberman <jhaberman@gmail.com>2015-06-22 00:53:04 -0700
commitc3e9a57a6fff08640f3ad05e8df971d5ddb37d51 (patch)
tree0bca6f63eb1813dd3f21b4e570f7f586e829f519 /Makefile
parent19a973a85ef5a2eaf1ca59d09ec2d6e972c0cd24 (diff)
Fixed some bad bugs in upb_env.
Also added a unit test for upb_encoder that demonstrates the bugs and the fix.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d67beb0..19e7c8e 100644
--- a/Makefile
+++ b/Makefile
@@ -288,6 +288,7 @@ C_TESTS = \
CC_TESTS = \
tests/pb/test_decoder \
+ tests/pb/test_encoder \
tests/json/test_json \
tests/test_cpp \
tests/test_table \
@@ -316,12 +317,11 @@ tests/pb/test_varint: LIBS = lib/libupb.pb.a lib/libupb.a $(EXTRA_LIBS)
tests/test_def: LIBS = $(LOAD_DESCRIPTOR_LIBS) lib/libupb.a $(EXTRA_LIBS)
tests/test_handlers: LIBS = lib/libupb.descriptor.a lib/libupb.a $(EXTRA_LIBS)
tests/pb/test_decoder: LIBS = lib/libupb.pb.a lib/libupb.a $(EXTRA_LIBS)
+tests/pb/test_encoder: LIBS = lib/libupb.pb.a lib/libupb.descriptor.a lib/libupb.a $(EXTRA_LIBS)
tests/test_cpp: LIBS = $(LOAD_DESCRIPTOR_LIBS) lib/libupb.a $(EXTRA_LIBS)
tests/test_table: LIBS = lib/libupb.a $(EXTRA_LIBS)
tests/json/test_json: LIBS = lib/libupb.a lib/libupb.json.a $(EXTRA_LIBS)
-tests/test_def: tests/test.proto.pb
-
tests/test.proto.pb: tests/test.proto
@# TODO: add .proto file parser to upb so this isn't necessary.
protoc tests/test.proto -otests/test.proto.pb
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback