diff options
| author |  Yilun Chong <yilunchong@google.com> | 2018-02-09 11:47:00 -0800 |
|---|---|---|
| committer | Yilun Chong <yilunchong@google.com> | 2018-02-09 11:47:00 -0800 |
| commit | 6cd4ec497239070c1513c9dd05fc88cd3ecc57fd (patch) | |
| tree | b4feba6edbbc0b57caa6381e7bb5bf62d14af257 /benchmarks/Makefile.am | |
| parent | 07f023188e929019f506e9b390dde70539ea857f (diff) | |
Sync internal benchmark changes
Diffstat (limited to 'benchmarks/Makefile.am')
| -rw-r--r--[-rwxr-xr-x] | benchmarks/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index cdda92ba..5aa35c66 100755..100644 --- 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 |