From 7847f8a0ca19210c620c904c90366c1392ee2969 Mon Sep 17 00:00:00 2001 From: Leonardo de Moura Date: Sat, 7 Jun 2014 13:13:47 -0700 Subject: [PATCH] fix(tests/util): disable some tests that do not compile on OSX + Boost + MULTI_THREAD --- src/tests/util/rb_tree.cpp | 6 ++---- src/tests/util/thread.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/tests/util/rb_tree.cpp b/src/tests/util/rb_tree.cpp index 93fd7d1acb..2dd2f8dec5 100644 --- a/src/tests/util/rb_tree.cpp +++ b/src/tests/util/rb_tree.cpp @@ -193,8 +193,8 @@ static void tst5() { #define DEFAULT_STEP 5 #endif -#if defined(LEAN_MULTI_THREAD) static void tst6() { +#if defined(LEAN_MULTI_THREAD) && !defined(__APPLE__) int_rb_tree t; const unsigned SZ = DEFAULT_SZ; for (unsigned i = 0; i < SZ; i++) { @@ -232,8 +232,8 @@ static void tst6() { } } } -} #endif +} int main() { tst1(); @@ -241,9 +241,7 @@ int main() { tst3(); tst4(); tst5(); -#if defined(LEAN_MULTI_THREAD) tst6(); -#endif return has_violations() ? 1 : 0; } diff --git a/src/tests/util/thread.cpp b/src/tests/util/thread.cpp index c8d496f9d4..dd228c0e50 100644 --- a/src/tests/util/thread.cpp +++ b/src/tests/util/thread.cpp @@ -14,7 +14,7 @@ Author: Leonardo de Moura #include "util/thread_script_state.h" using namespace lean; -#if defined(LEAN_MULTI_THREAD) +#if defined(LEAN_MULTI_THREAD) && !defined(__APPLE__) void foo() { LEAN_THREAD_PTR(std::vector) v; if (!v.get()) v.reset(new std::vector(1024));