From 6cd4ec497239070c1513c9dd05fc88cd3ecc57fd Mon Sep 17 00:00:00 2001 From: Yilun Chong Date: Fri, 9 Feb 2018 11:47:00 -0800 Subject: Sync internal benchmark changes --- benchmarks/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 benchmarks/Makefile.am (limited to 'benchmarks/Makefile.am') diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am old mode 100755 new mode 100644 index cdda92ba..5aa35c66 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -104,7 +104,7 @@ initialize_submodule: oldpwd=`pwd` cd $(top_srcdir)/third_party git submodule update --init -r - cd $(top_srcdir)/third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_GTEST_TESTS=OFF && make + cd $(top_srcdir)/third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release && make cd $$oldpwd touch initialize_submodule @@ -137,7 +137,7 @@ cpp: protoc_middleman protoc_middleman2 cpp-benchmark initialize_submodule java_benchmark_testing_files = \ java/src/main/java/com/google/protobuf/ProtoBench.java \ - java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java + java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middleman2 cp -r java tmp && cd tmp/java && mvn clean compile assembly:single -- cgit v1.2.3