diff options
| author | Yilun Chong <yilunchong@google.com> | 2017-12-04 14:39:08 -0800 |
|---|---|---|
| committer | Yilun Chong <yilunchong@google.com> | 2017-12-04 14:39:08 -0800 |
| commit | 1fd6c1761e7c70081af3b71a76a890002d4b578d (patch) | |
| tree | ef1f5f423e2ef240447caed9b9ac5949e5b348df /benchmarks | |
| parent | 1c062a65af0fb439167d9cf81ef28c14c3836ace (diff) | |
| download | protobuf-1fd6c1761e7c70081af3b71a76a890002d4b578d.tar.gz protobuf-1fd6c1761e7c70081af3b71a76a890002d4b578d.tar.bz2 protobuf-1fd6c1761e7c70081af3b71a76a890002d4b578d.zip | |
Fix bugs to pass tests
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/Makefile.am | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index c343bd35..e9e08a0d 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -19,16 +19,17 @@ benchmarks_protoc_inputs_proto2 = \ datasets/google_message4/benchmark_message4_2.proto \ datasets/google_message4/benchmark_message4_3.proto -MAINTAINERCLEANFILES = \ - Makefile.in +make_tmp_dir: + mkdir -p 'tmp' + touch make_tmp_dir if USE_EXTERNAL_PROTOC -protoc_middleman: $(benchmarks_protoc_inputs) +protoc_middleman: make_tmp_dir $(benchmarks_protoc_inputs) $(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=./tmp $(benchmarks_protoc_inputs) touch protoc_middleman -protoc_middleman2: $(benchmarks_protoc_inputs_proto2) +protoc_middleman2: make_tmp_dir $(benchmarks_protoc_inputs_proto2) $(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=./tmp $(benchmarks_protoc_inputs_proto2) touch protoc_middleman2 @@ -37,11 +38,11 @@ else # We have to cd to $(srcdir) before executing protoc because $(protoc_inputs) is # relative to srcdir, which may not be the same as the current directory when # building out-of-tree. -protoc_middleman: $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs) $(well_known_type_protoc_inputs) +protoc_middleman: make_tmp_dir $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs) $(well_known_type_protoc_inputs) oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd/tmp $(benchmarks_protoc_inputs) ) touch protoc_middleman -protoc_middleman2: $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs_proto2) $(well_known_type_protoc_inputs) +protoc_middleman2: make_tmp_dir $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs_proto2) $(well_known_type_protoc_inputs) oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd/tmp $(benchmarks_protoc_inputs_proto2) ) touch protoc_middleman2 @@ -109,7 +110,7 @@ cpp_benchmark_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir) -I$(top_srcdir)/third_p # Explicit deps because BUILT_SOURCES are only done before a "make all/check" # so a direct "make test_cpp" could fail if parallel enough. # See: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html#Recording-Dependencies-manually -cpp_benchmark.$(OBJEXT): $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2) $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header) +cpp_benchmark-cpp_benchmark.$(OBJEXT): $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2) $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header) nodist_cpp_benchmark_SOURCES = \ $(benchmarks_protoc_outputs) \ $(benchmarks_protoc_outputs_proto2) \ @@ -142,11 +143,15 @@ java: protoc_middleman protoc_middleman2 java-benchmark ############# JAVA RULES END ############## +MAINTAINERCLEANFILES = \ + Makefile.in + CLEANFILES = \ $(benchmarks_protoc_outputs) \ $(benchmarks_protoc_outputs_header) \ $(benchmarks_protoc_outputs_proto2) \ $(benchmarks_protoc_outputs_proto2_header) \ + make_tmp_dir \ protoc_middleman \ protoc_middleman2 \ javac_middleman \ |