Commit graph

323 commits

Author SHA1 Message Date
Eric 55285fd2ae Merge pull request #73 from google/64.32
Fix #72 by avoiding 64-to-32-bit shortenings
2015-02-18 16:39:24 -05:00
Dominic Hamon 3968ff45ba Fix #72 by avoiding 64-to-32-bit shortenings 2015-02-18 11:18:40 -08:00
Dominic Hamon fd7d288bbe Add section on linking to satisfy #67 2014-12-26 08:44:14 -08:00
Dominic Hamon b40b66ab3b Actually fix issue with CHECK 2014-12-02 12:58:14 -08:00
Dominic Hamon d31977bb69 Added gtest CHECK symbol to benchmark test 2014-12-02 12:51:46 -08:00
Dominic Hamon 2aa2442024 Remove drone.io reference 2014-12-02 12:46:27 -08:00
Dominic Hamon d58d59588f Merge pull request #66 from 3Hren/master
Using Travis CI.
2014-11-14 14:19:16 -08:00
Evgeny Safronov 1bc73789e4 Update AUTHORS and CONTRIBUTORS. 2014-11-14 23:39:38 +04:00
Dominic Hamon 4249753cd9 Merge pull request #68 from eddyxu/debug_factorial
Use #ifdef to protect calling Factorial in benchmark_test.cc
2014-11-14 09:56:50 -08:00
Evgeny Safronov 6f692460e7 Update readme.
Added Travis build status badge.
2014-11-14 11:11:45 +04:00
Lei Xu 0f78cebba5 Use #ifdef to protect calling Factorial in benchmark_test.cc 2014-11-13 16:09:21 -08:00
Dominic Hamon 7e290fb965 Fix release builds 2014-11-13 13:12:28 -08:00
Dominic Hamon 66f0b5d0ed Merge pull request #63 from google/62.CHECK
Remove CHECK_* from public API.
2014-11-13 13:11:11 -08:00
Dominic Hamon 4932b72b03 Fix example in README.md to compile.
Fixes #65
2014-11-13 13:06:28 -08:00
Evgeny Safronov 35c29c7d2f Added c++11 support for Travis. 2014-11-12 14:30:57 +04:00
Evgeny Safronov e4d41f8a23 Using Travis as CI. 2014-11-12 13:32:00 +04:00
Dominic Hamon a3b5e44c52 Remove CHECK_* from public API.
CHECK_* are now private and used internally in the library. The test
uses have been replaced with asserts.

Fixes #62.
2014-10-31 21:54:55 -07:00
Dominic Hamon d750144542 Merge pull request #60 from everbase/master
added googletest dependency to tests (allows compilation with -j)
2014-10-31 21:39:28 -07:00
Niklas Hofmann 27aa01a3f9 remove -Wzero-as-null-pointer-constant flag for now 2014-10-26 03:23:15 +01:00
Niklas Hofmann b04211cc88 Merge branch 'master' of github.com:google/benchmark 2014-10-25 18:35:35 +02:00
Chris Kennelly f9ef4f4edf Merge pull request #59 from zjx20/instance_mutex
Turn the global mutex into instance variables
2014-10-18 15:34:11 -07:00
Chris Kennelly 8eac5dc328 Merge pull request #58 from google/zero_null
Fix #50 by using nullptr and adding stricter warning.
2014-10-18 15:33:40 -07:00
Chris Kennelly 5f31f0dca2 Merge pull request #57 from google/flag_variants
Fix #54 by correcting reference to CXX flags for variants.
2014-10-18 15:33:07 -07:00
Chris Kennelly 06201b3429 Merge pull request #56 from google/pthread_dependency
Move pthread dependency to test CMakeLists.txt
2014-10-18 15:32:31 -07:00
Niklas Hofmann 3e9264dcf1 added googletest dependency to tests (allows compilation with -j) 2014-10-16 19:17:08 +02:00
x.zhou 4a3348ce22 Turn the global mutex into instance variables
To fix #52
2014-10-12 18:01:45 +08:00
Dominic Hamon e6107a781c Fix #50 by using nullptr and adding stricter warning. 2014-10-11 15:52:50 -07:00
Dominic Hamon f98c5760fe Fix #54 by correcting reference to CXX flags for variants. 2014-10-11 15:13:00 -07:00
Dominic Hamon a13627bc3a Move pthread dependency to test CMakeLists.txt 2014-10-11 14:57:45 -07:00
zjx20 0fcd190cd6 Update CONTRIBUTORS 2014-10-05 16:13:35 +08:00
zjx20 b6e5977132 Update AUTHORS 2014-10-05 16:12:31 +08:00
Dominic Hamon cfb34b5957 Merge branch 'mattyclarkson-regex' 2014-08-22 11:31:03 -07:00
Matt Clarkson 9593e64076 Fixed the CMake add_cxx_compiler_flag function 2014-08-22 14:56:12 +01:00
Matt Clarkson 0fd0be9789 Added more complicated regex test patterns 2014-08-22 14:55:46 +01:00
Matt Clarkson f043826542 C++11 regular expressions 2014-08-22 14:55:46 +01:00
Matt Clarkson edfa60a1d1 Resolve regular expression engines 2014-08-22 14:55:46 +01:00
Matt Clarkson fac16a662e CMakeLists.txt comments 2014-08-20 08:42:30 +01:00
Matt Clarkson 1c82191d7a Consistent indentation in CMakeLists.txt 2014-08-20 08:42:29 +01:00
Dominic Hamon d32c5c6442 Merge pull request #47 from mattyclarkson/benchmark_test
Make sure all benchmark tests run
2014-08-19 21:17:20 -07:00
Matt Clarkson 1176936966 Check the number of benchmark tests ran
Previously the benchmark_test program executed the benchmark tests to make sure
the API was working but was not checking the number of tests that were
completed. If the regular expression matching breaks, zero tests could be ran.
Similarly, if one of the APIs breaks and doesn't run the correct amount of tests
then `make test` will catch this.
2014-08-15 11:09:23 +01:00
Matt Clarkson 92ddf09f1d Ignore the result of make test 2014-08-15 11:09:23 +01:00
Matt Clarkson 38c27c2cb3 Do not use CMake CONCAT
CONCAT was added quite late in the CMake release cycles so lets use `set()`
instead which has been around _forever_...
2014-08-15 11:09:22 +01:00
Dominic Hamon b1041fc3d9 Merge pull request #48 from mattyclarkson/gtest_verify
Verify gtest with URL_MD5
2014-08-08 16:38:05 -07:00
Matt Clarkson 6a66991586 Verify gtest with URL_MD5 2014-08-08 13:46:04 +01:00
Dominic Hamon ed08661efe Remove URL_HASH as it is unsupported 2014-08-07 10:28:55 -07:00
Dominic Hamon 0e494bcb34 Merge pull request #46 from mattyclarkson/gtest_verify
Verify the download of gtest
2014-08-07 10:20:46 -07:00
Matt Clarkson d2aa5c1eb3 Verify the download of gtest 2014-08-07 17:58:30 +01:00
Matt Clarkson 373cc41100 C++11 concurrency instead of pthread 2014-08-06 10:50:21 -07:00
Matt Clarkson 6b1a6958c4 CMake function for adding compiler flags 2014-08-04 10:01:44 +01:00
Matt Clarkson 6945096ba1 Add -Wshadow if supported 2014-08-04 10:01:44 +01:00