diff options
author | Josh Haberman <jhaberman@gmail.com> | 2014-11-18 15:21:50 -0800 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2014-11-18 15:21:50 -0800 |
commit | 3d0c7c45da5b72a88bfb03dc5ce3384b7f01cef6 (patch) | |
tree | 1c9fd69700e1162c7ed78458160800b586600c9b /tests/bindings/googlepb | |
parent | 648afe3da654b6e08fe6ea26ae520581eb892e23 (diff) |
Sync to Google-internal development.
Diffstat (limited to 'tests/bindings/googlepb')
-rw-r--r-- | tests/bindings/googlepb/test_vs_proto2.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/bindings/googlepb/test_vs_proto2.cc b/tests/bindings/googlepb/test_vs_proto2.cc index 2d53f80..15a5388 100644 --- a/tests/bindings/googlepb/test_vs_proto2.cc +++ b/tests/bindings/googlepb/test_vs_proto2.cc @@ -27,8 +27,14 @@ #include "upb/pb/glue.h" #include "upb/pb/varint.int.h" -static const char message_data[] = { -#include MESSAGE_DATA_HFILE +// Pull in string data from benchmarks/google_message{1,2}.dat +// (the .h files are generated with xxd). +const char message1_data[] = { +#include "benchmarks/google_message1.h" +}; + +const char message2_data[] = { +#include "benchmarks/google_message2.h" }; void compare_metadata(const google::protobuf::Descriptor* d, @@ -117,8 +123,8 @@ extern "C" { int run_tests(int argc, char *argv[]) { UPB_UNUSED(argc); UPB_UNUSED(argv); - size_t len = sizeof(message_data); - const char *str = message_data; + size_t len = sizeof(MESSAGE_DATA_IDENT); + const char *str = MESSAGE_DATA_IDENT; MESSAGE_CIDENT msg1; MESSAGE_CIDENT msg2; |