Commit Graph

444 Commits

Author SHA1 Message Date
Eric Fiselier
e447887d16 Fix travis config by moving CTEST_OUTPUT_ON_FAILURE=1 into make test command 2015-03-09 14:40:08 -04:00
Eric Fiselier
6590ceab74 Merge branch 'upgrade-step1' into upgrade-step2 2015-03-09 14:34:44 -04:00
Eric Fiselier
f7602badfb add env to make ctest print on failure 2015-03-09 14:34:32 -04:00
Eric Fiselier
a187aa0803 Third step in moving towards adopting new timer semantics 2015-03-06 17:01:05 -05:00
Eric Fiselier
f947cebe15 remove ifdefs around BM_Factorial 2015-03-06 16:59:32 -05:00
Eric Fiselier
8f96f50553 comment out test to prevent failures. 2015-03-06 16:53:52 -05:00
Eric Fiselier
f1c398adb4 invert check in GetLogInstanceForLevel() 2015-03-06 14:19:06 -05:00
Eric Fiselier
8ed7d7664b The second step towards merging the timer changes.
This patch does two things:

1. It overhalls the static initialization in Walltime to be simplier. It uses
   a static variable inside WallTime::Now() to initialize the timer.

2. Add a logging mechanism so that the -v flag actually has meaning and
   reimplement the CHECK macros to allow extra messages to be streamed in.
2015-03-06 14:07:24 -05:00
Eric Fiselier
b1f34d3880 address comments 2015-03-06 13:20:47 -05:00
Eric Fiselier
5b41e128b3 Step one towards merging timer changes.
This patch cleans up our use of generic macros and also merges changes in the
build system.

It adds options -DBENCHMARK_ENABLE_TESTING and -DBENCHMARK_ENABLE_SHARED.
2015-03-06 12:35:00 -05:00
Eric Fiselier
c5a362b4d3 Change std::regex detection test to detect bug in libstdc++.
libstdc++'s std::regex has (or had) a bug in std::regex::operator=(...) that
caused undefined behaviour. Clang will detect this and compile the function so
that it crashes at runtime. This patch tried to detect that bug during
configuration.
2015-03-06 12:05:19 -05:00
Eric
056a008afa Merge pull request #75 from google/outofsource
Add _build to gitignore to enable out-of-source builds
2015-03-02 20:29:21 +01:00
Eric
cff940a727 Merge pull request #78 from pdavydov108/master
Fix #77 build on freebsd 10
2015-03-02 20:10:20 +01:00
Eric
5e77de62a1 Merge pull request #76 from google/64-32
One more 64-bit to 32-bit conversion
2015-03-02 17:47:02 +01:00
Pavel Davydov
8e3e78fc3d Fix #77 add comment to headers in wrong order 2015-02-25 10:41:26 +03:00
Dominic Hamon
5fe797b6f9 Add top-level folders to gitignore to enable out-of-source builds 2015-02-21 15:00:06 -08:00
Pavel Davydov
26c01ee9ab Fix #77 add FreeBSD detection in cmake 2015-02-21 17:23:20 +03:00
Pavel Davydov
c8d05fcc96 Fix #77 build on FreeBSD 10 2015-02-21 17:05:13 +03:00
Eric Fiselier
114886100b Don't use c++14 2015-02-19 16:38:30 -05:00
Eric Fiselier
9a11834048 add includes for stdint.h 2015-02-19 16:37:05 -05:00
Dominic Hamon
2789aba1ce One more 64-bit to 32-bit conversion 2015-02-18 22:21:39 -08:00
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