Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade benchmark submodule #4265

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmarks/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 && make
cd $(top_srcdir)/third_party/benchmark && cmake -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_GTEST_TESTS=OFF && make
cd $$oldpwd
touch initialize_submodule

Expand Down
2 changes: 1 addition & 1 deletion third_party/benchmark
Submodule benchmark updated 78 files
+5 −0 .clang-format
+28 −0 .travis-libcxx-setup.sh
+0 −26 .travis-setup.sh
+138 −24 .travis.yml
+9 −0 AUTHORS
+62 −6 CMakeLists.txt
+10 −0 CONTRIBUTORS
+393 −28 README.md
+39 −110 appveyor.yml
+31 −4 cmake/AddCXXCompilerFlag.cmake
+10 −3 cmake/CXXFeatureCheck.cmake
+1 −0 cmake/Config.cmake.in
+59 −0 docs/tools.md
+1,193 −4 include/benchmark/benchmark.h
+19 −633 include/benchmark/benchmark_api.h
+0 −48 include/benchmark/macros.h
+9 −110 include/benchmark/reporter.h
+51 −24 src/CMakeLists.txt
+3 −4 src/arraysize.h
+441 −718 src/benchmark.cc
+46 −0 src/benchmark_api_internal.h
+467 −0 src/benchmark_register.cc
+40 −21 src/check.h
+87 −15 src/colorprint.cc
+15 −1 src/colorprint.h
+15 −17 src/commandlineflags.cc
+5 −2 src/commandlineflags.h
+324 −0 src/complexity.cc
+60 −0 src/complexity.h
+106 −62 src/console_reporter.cc
+68 −0 src/counter.cc
+8 −26 src/counter.h
+93 −54 src/csv_reporter.cc
+33 −6 src/cycleclock.h
+36 −19 src/internal_macros.h
+65 −63 src/json_reporter.cc
+0 −40 src/log.cc
+56 −11 src/log.h
+70 −57 src/mutex.h
+83 −3 src/re.h
+0 −59 src/re_posix.cc
+33 −63 src/reporter.cc
+2 −1 src/sleep.cc
+5 −7 src/sleep.h
+11 −8 src/stat.h
+25 −22 src/string_util.cc
+9 −13 src/string_util.h
+64 −129 src/sysinfo.cc
+0 −2 src/sysinfo.h
+212 −0 src/timers.cc
+48 −0 src/timers.h
+0 −263 src/walltime.cc
+0 −17 src/walltime.h
+86 −8 test/CMakeLists.txt
+19 −22 test/basic_test.cc
+75 −41 test/benchmark_test.cc
+167 −0 test/complexity_test.cc
+24 −7 test/cxx03_test.cc
+64 −0 test/diagnostics_test.cc
+52 −0 test/donotoptimize_test.cc
+34 −21 test/filter_test.cc
+3 −6 test/fixture_test.cc
+5 −7 test/map_test.cc
+74 −0 test/multiple_ranges_test.cc
+30 −7 test/options_test.cc
+201 −0 test/output_test.h
+423 −0 test/output_test_helper.cc
+182 −0 test/register_benchmark_test.cc
+256 −0 test/reporter_output_test.cc
+150 −0 test/skip_with_error_test.cc
+250 −0 test/user_counters_tabular_test.cc
+217 −0 test/user_counters_test.cc
+68 −0 tools/compare_bench.py
+60 −0 tools/gbench/Inputs/test1_run1.json
+60 −0 tools/gbench/Inputs/test1_run2.json
+8 −0 tools/gbench/__init__.py
+146 −0 tools/gbench/report.py
+159 −0 tools/gbench/util.py