diff options
| author |  Yilun Chong <yilunchong@google.com> | 2018-04-13 14:54:58 -0700 |
|---|---|---|
| committer | Yilun Chong <yilunchong@google.com> | 2018-04-13 14:54:58 -0700 |
| commit | 092134593ddf4fa9d20aebbaf7a9ffd81f9a56f8 (patch) | |
| tree | 49028f6774904ec9dd030db7530554c08796dff4 /benchmarks/Makefile.am | |
| parent | 320d56c833f835f40c56bdaf2a375768cdd1b334 (diff) | |
fix java benchmark, fix dashboard build
Diffstat (limited to 'benchmarks/Makefile.am')
| -rw-r--r-- | benchmarks/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index e5d0855b..b84e40af 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -123,7 +123,6 @@ cpp: protoc_middleman protoc_middleman2 cpp-benchmark initialize_submodule ############# JAVA RULES ############## java_benchmark_testing_files = \ - java/src/main/java/com/google/protobuf/ProtoBench.java \ java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middleman2 @@ -134,7 +133,14 @@ javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middlem java-benchmark: javac_middleman @echo "Writing shortcut script java-benchmark..." @echo '#! /bin/sh' > java-benchmark - @echo 'java -cp '"tmp/java/target/*.jar"' com.google.protobuf.ProtoBench $$@' >> java-benchmark + @echo 'all_data=""' >> java-benchmark + @echo 'conf=()' >> java-benchmark + @echo 'data_files=""' >> java-benchmark + @echo 'for arg in $$@; do if [[ $${arg:0:1} == "-" ]]; then conf+=($$arg); else data_files+="$$arg,"; fi; done' >> java-benchmark + @echo 'java -cp '"tmp/java/target/*.jar"' com.google.caliper.runner.CaliperMain com.google.protobuf.ProtoCaliperBenchmark -i runtime '"\\" >> java-benchmark + @echo '-b serializeToByteString,serializeToByteArray,serializeToMemoryStream,'"\\" >> java-benchmark + @echo 'deserializeFromByteString,deserializeFromByteArray,deserializeFromMemoryStream '"\\" >> java-benchmark + @echo '-DdataFile=$${data_files:0:-1} $${conf[*]}' >> java-benchmark @chmod +x java-benchmark java: protoc_middleman protoc_middleman2 java-benchmark |