diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2014-02-04 15:43:52 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2014-02-04 15:43:52 -0800 |
| commit | 7d565f1e7a0f107506d3cf31ef2e33e22a504d2b (patch) | |
| tree | 151a5102b0ded6e8ad098a86e692c1d14e390167 /Makefile | |
| parent | 0fd2f830882402979a83010e89650e7245960d39 (diff) | |
Sync from Google development.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -47,7 +47,7 @@ endif CC=gcc CXX=g++ CFLAGS=-std=gnu99 -CXXFLAGS=-Ibindings/cpp +CXXFLAGS=-std=c++11 INCLUDE=-Itests -I. CPPFLAGS=$(INCLUDE) -Wall -Wextra -Wno-sign-compare $(USER_CFLAGS) LDLIBS=-lpthread upb/libupb.a @@ -220,10 +220,7 @@ SIMPLE_TESTS= \ SIMPLE_CXX_TESTS= \ tests/test_cpp \ - - # The build process for this test is complicated and hasn't been - # ported to the open-source Makefile yet. - # tests/test_decoder \ + tests/pb/test_decoder VARIADIC_TESTS= \ tests/t.test_vs_proto2.googlemessage1 \ |