diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2018-03-20 16:14:32 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-20 16:14:32 -0700 |
| commit | ed4321d1cb33199984118d801956822842771e7e (patch) | |
| tree | 16c54ef8d5409766c18ccae8fca685230680d620 /benchmarks | |
| parent | e436ee0aa179340832281b7d90885e9ff15b3748 (diff) | |
| parent | 11d26ce24c90a6cf2544f71e09970513550ef6c6 (diff) | |
Merge pull request #4387 from acozzette/down-integrate
Integrated internal changes from Google
Diffstat (limited to 'benchmarks')
| -rwxr-xr-x | benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java | 1 | ||||
| -rwxr-xr-x | benchmarks/py_benchmark.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java b/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java index 7dff16dc..b50c6585 100755 --- a/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java +++ b/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java @@ -243,3 +243,4 @@ public class ProtoCaliperBenchmark { } } + diff --git a/benchmarks/py_benchmark.py b/benchmarks/py_benchmark.py index 8858f4aa..ba7a3470 100755 --- a/benchmarks/py_benchmark.py +++ b/benchmarks/py_benchmark.py @@ -115,3 +115,4 @@ class Benchmark: if __name__ == "__main__": for i in range(2, len(sys.argv)): run_one_test(sys.argv[i]) + |