summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2016-04-21 16:26:52 -0700
committerJoshua Haberman <jhaberman@gmail.com>2016-04-21 16:26:52 -0700
commitac2689cec721eb94b49dfbfed310e2e0e3bdfa2b (patch)
tree1f6b0b65b2a8b49d281b23ed4a1ef066525e4556 /Makefile
parente6fa3f9d869765544b8e424e8573fe8d9af35534 (diff)
Put oneofs in the same table as fields. (#60)
* Put oneofs in the same table as fields. Oneofs and fields are not allowed to have names that conflict, so we might as well put them all in the same table. This also allows an efficient operation that looks for both fields and oneofs in a single lookup. Added support for OneofDef to Lua to allow testing of this. * Addressed PR comments.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 966168b..142a5cc 100644
--- a/Makefile
+++ b/Makefile
@@ -109,6 +109,7 @@ dep:
clean_leave_profile:
@rm -rf obj lib
@rm -f tests/google_message?.h
+ @rm -f tests/json/test.upbdefs.o
@rm -f $(TESTS) tests/testmain.o tests/t.*
@rm -rf tools/upbc deps
@rm -rf upb/bindings/python/build
@@ -455,8 +456,8 @@ LUATESTS = \
.PHONY: clean_lua testlua lua
testlua: lua
- @set -e # Abort on error.
- @for test in $(LUATESTS) ; do \
+ @set -e; \
+ for test in $(LUATESTS) ; do \
echo LUA $$test; \
LUA_PATH="third_party/lunit/?.lua;upb/bindings/lua/?.lua" \
LUA_CPATH=upb/bindings/lua/?.so \
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback