Merge pull request #63 from google/62.CHECK
Remove CHECK_* from public API.
diff --git a/include/benchmark/macros.h b/include/benchmark/macros.h
index da408d4..b842bcc 100644
--- a/include/benchmark/macros.h
+++ b/include/benchmark/macros.h
@@ -35,17 +35,6 @@
#define arraysize(array) (sizeof(ArraySizeHelper(array)))
-#define CHECK(b) \
- do { \
- if (!(b)) assert(false); \
- } while (0)
-#define CHECK_EQ(a, b) CHECK((a) == (b))
-#define CHECK_NE(a, b) CHECK((a) != (b))
-#define CHECK_GE(a, b) CHECK((a) >= (b))
-#define CHECK_LE(a, b) CHECK((a) <= (b))
-#define CHECK_GT(a, b) CHECK((a) > (b))
-#define CHECK_LT(a, b) CHECK((a) < (b))
-
//
// Prevent the compiler from complaining about or optimizing away variables
// that appear unused.
diff --git a/src/benchmark.cc b/src/benchmark.cc
index 72b59f1..506f7c1 100644
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include "benchmark/benchmark.h"
-#include "benchmark/macros.h"
+#include "check.h"
#include "colorprint.h"
#include "commandlineflags.h"
#include "re.h"
diff --git a/src/check.h b/src/check.h
new file mode 100644
index 0000000..6dd79cb
--- /dev/null
+++ b/src/check.h
@@ -0,0 +1,17 @@
+#ifndef CHECK_H_
+#define CHECK_H_
+
+#include <cassert>
+
+#define CHECK(b) \
+ do { \
+ if (!(b)) assert(false); \
+ } while (0)
+#define CHECK_EQ(a, b) CHECK((a) == (b))
+#define CHECK_NE(a, b) CHECK((a) != (b))
+#define CHECK_GE(a, b) CHECK((a) >= (b))
+#define CHECK_LE(a, b) CHECK((a) <= (b))
+#define CHECK_GT(a, b) CHECK((a) > (b))
+#define CHECK_LT(a, b) CHECK((a) < (b))
+
+#endif // CHECK_H_
diff --git a/src/re_posix.cc b/src/re_posix.cc
index e51e2b6..30e248c 100644
--- a/src/re_posix.cc
+++ b/src/re_posix.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <benchmark/macros.h>
+#include "check.h"
#include "re.h"
namespace benchmark {
diff --git a/src/sysinfo.cc b/src/sysinfo.cc
index a8c0bdb..e907cc3 100644
--- a/src/sysinfo.cc
+++ b/src/sysinfo.cc
@@ -29,7 +29,7 @@
#include <limits>
#include <mutex>
-#include "benchmark/macros.h"
+#include "check.h"
#include "cycleclock.h"
#include "sleep.h"
diff --git a/src/walltime.cc b/src/walltime.cc
index 52bab35..c20066a 100644
--- a/src/walltime.cc
+++ b/src/walltime.cc
@@ -22,7 +22,7 @@
#include <atomic>
#include <limits>
-#include "benchmark/macros.h"
+#include "check.h"
#include "cycleclock.h"
#include "sysinfo.h"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fb2e250..948124d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,6 @@
# Demonstration executable
add_executable(benchmark_test benchmark_test.cc)
target_link_libraries(benchmark_test benchmark ${CMAKE_THREAD_LIBS_INIT})
-add_dependencies(benchmark_test googletest)
add_test(benchmark benchmark_test 50)
add_test(benchmark_filter_simple benchmark_test --benchmark_filter=Calculate 16)
add_test(benchmark_filter_prefix benchmark_test --benchmark_filter=*Calculate 0)
diff --git a/test/benchmark_test.cc b/test/benchmark_test.cc
index 07016b7..7f7f939 100644
--- a/test/benchmark_test.cc
+++ b/test/benchmark_test.cc
@@ -1,5 +1,6 @@
#include "benchmark/benchmark.h"
+#include <assert.h>
#include <math.h>
#include <stdint.h>
@@ -109,7 +110,7 @@
while (state.KeepRunning())
r |= s1.compare(s2);
// Prevent compiler optimizations
- CHECK(r != std::numeric_limits<int>::max());
+ assert(r != std::numeric_limits<int>::max());
}
BENCHMARK(BM_StringCompare)->Range(1, 1<<20);
@@ -138,7 +139,7 @@
while (state.KeepRunning())
for (int i = 0; i < state.range_x(); ++i)
tracker += i;
- CHECK(tracker != 0.0);
+ assert(tracker != 0.0);
}
BENCHMARK(BM_LongTest)->Range(1<<16,1<<28);
@@ -168,8 +169,8 @@
int main(int argc, const char* argv[]) {
benchmark::Initialize(&argc, argv);
- CHECK(Factorial(8) == 40320);
- CHECK(CalculatePi(1) == 0.0);
+ assert(Factorial(8) == 40320);
+ assert(CalculatePi(1) == 0.0);
TestReporter test_reporter;
benchmark::RunSpecifiedBenchmarks(&test_reporter);
