Skip to content

update tests #349

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

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open
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
12 changes: 5 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ image: Visual Studio 2015
environment:
matrix:

- TOOLSET: msvc-12.0
VARIANT: release

- TOOLSET: msvc-14.0
ADDRMD: 32
VARIANT: debug
Expand All @@ -45,9 +42,10 @@ environment:
TOOLSET: gcc
VARIANT: release

- ADDPATH: C:\mingw\bin;
TOOLSET: gcc
VARIANT: debug
# FIXME:
# - ADDPATH: C:\mingw\bin;
# TOOLSET: gcc
# VARIANT: debug

# The following configurations fail with
# ./boost/thread/detail/invoke.hpp:101:43: internal compiler error: in gimplify_expr, at gimplify.c:12039
Expand Down Expand Up @@ -86,4 +84,4 @@ test_script:
- if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
- if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
- if not "%VARIANT%" == "" set VARIANT=variant=%VARIANT%
- b2 -j2 --abbreviate-paths libs/thread/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% %VARIANT%
- b2 --abbreviate-paths libs/thread/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% %VARIANT%
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <boost/thread/thread.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <cassert>
#include "../../../timming.hpp"

// Summary of each test:
// 1. Start the test thread and wait for it to start up.
Expand Down Expand Up @@ -82,7 +83,7 @@ void test_posix_wait_function(F f)
t.join();
boost::posix_time::ptime t1 = boost::posix_time::microsec_clock::universal_time();

BOOST_TEST(t1 - t0 < boost::posix_time::milliseconds(250));
BOOST_TEST(t1 - t0 < boost::posix_time::milliseconds(BOOST_THREAD_TEST_TIME_MS));
}

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -153,7 +154,7 @@ void test_chrono_wait_function(F f)
t.join();
boost::chrono::steady_clock::time_point t1 = boost::chrono::steady_clock::now();

BOOST_TEST(t1 - t0 < boost::chrono::milliseconds(250));
BOOST_TEST(t1 - t0 < boost::chrono::milliseconds(BOOST_THREAD_TEST_TIME_MS));
}

//------------------------------------------------------------------------------
Expand Down
9 changes: 5 additions & 4 deletions test/sync/futures/async/async_executor_pass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/thread/executors/basic_thread_pool.hpp>
#include <boost/thread/executor.hpp>
#include "../../../timming.hpp"

typedef boost::chrono::high_resolution_clock Clock;
typedef boost::chrono::milliseconds ms;
Expand Down Expand Up @@ -156,7 +157,7 @@ struct check_timer {
}
~check_timer() {
Clock::time_point now = Clock::now();
BOOST_TEST(now - start < delay);
BOOST_THREAD_TEST_IT(now - start, delay);
std::cout << __FILE__ << "[" << __LINE__ << "] " << (now - start).count() << std::endl;
}

Expand All @@ -174,7 +175,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(2 * BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -200,7 +201,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(2 * BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand Down Expand Up @@ -229,7 +230,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(2 * BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand Down
61 changes: 31 additions & 30 deletions test/sync/futures/async/async_pass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <boost/thread/csbl/memory/unique_ptr.hpp>
#include <memory>
#include <boost/detail/lightweight_test.hpp>
#include "../../../timming.hpp"

typedef boost::chrono::high_resolution_clock Clock;
typedef boost::chrono::milliseconds ms;
Expand Down Expand Up @@ -159,7 +160,7 @@ struct check_timer {
}
~check_timer() {
Clock::time_point now = Clock::now();
BOOST_TEST(now - start < delay);
BOOST_THREAD_TEST_IT(now - start, delay);
std::cout << __FILE__ << "[" << __LINE__ << "] " << (now - start).count() << std::endl;
}

Expand Down Expand Up @@ -217,7 +218,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -241,7 +242,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -265,7 +266,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -289,7 +290,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -314,7 +315,7 @@ int main()
//boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -341,7 +342,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -366,7 +367,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -391,7 +392,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -415,7 +416,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -439,7 +440,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -463,7 +464,7 @@ int main()
//boost::this_thread::sleep_for(ms(300));
int res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res == 3);
Expand All @@ -487,7 +488,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int* res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = &f.get();
}
BOOST_TEST(res == &i);
Expand All @@ -510,7 +511,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int* res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = &f.get();
}
BOOST_TEST(res == &i);
Expand All @@ -533,7 +534,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
int* res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = &f.get();
}
BOOST_TEST(res == &i);
Expand All @@ -557,7 +558,7 @@ int main()
//boost::this_thread::sleep_for(ms(300));
int* res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = &f.get();
}
BOOST_TEST(res == &i);
Expand All @@ -580,7 +581,7 @@ int main()
boost::future<void> f = boost::async(f2);
boost::this_thread::sleep_for(ms(300));
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
f.get();
}
}
Expand All @@ -601,7 +602,7 @@ int main()
boost::future<void> f = boost::async(boost::launch::async, f2);
boost::this_thread::sleep_for(ms(300));
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
f.get();
}
}
Expand All @@ -622,7 +623,7 @@ int main()
boost::future<void> f = boost::async(boost::launch::any, f2);
boost::this_thread::sleep_for(ms(300));
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
f.get();
}
}
Expand All @@ -644,7 +645,7 @@ int main()
boost::future<void> f = boost::async(boost::launch::deferred, f2);
//boost::this_thread::sleep_for(ms(300));
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
f.get();
}
}
Expand All @@ -668,7 +669,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
MoveOnly res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST_EQ(res.value, 2);
Expand All @@ -692,7 +693,7 @@ int main()
//boost::this_thread::sleep_for(ms(300));
MoveOnly res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST_EQ(res.value, 2);
Expand All @@ -717,7 +718,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
MoveOnly res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(res.value == 2);
Expand All @@ -740,7 +741,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
boost::csbl::unique_ptr<int> res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(*res == 3);
Expand All @@ -765,7 +766,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
boost::csbl::unique_ptr<int> res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(*res == 3);
Expand All @@ -788,7 +789,7 @@ int main()
//boost::this_thread::sleep_for(ms(300));
boost::csbl::unique_ptr<int> res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(*res == 3);
Expand All @@ -811,7 +812,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
boost::csbl::unique_ptr<int> res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(*res == 3);
Expand All @@ -837,7 +838,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
boost::csbl::unique_ptr<int> res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(*res == 3);
Expand All @@ -860,7 +861,7 @@ int main()
//boost::this_thread::sleep_for(ms(300));
boost::csbl::unique_ptr<int> res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(*res == 3);
Expand All @@ -883,7 +884,7 @@ int main()
boost::this_thread::sleep_for(ms(300));
boost::csbl::unique_ptr<int> res;
{
check_timer timer(ms(500));
check_timer timer(ms(200 + BOOST_THREAD_TEST_TIME_MS));
res = f.get();
}
BOOST_TEST(*res == 3);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ void f2()
boost::unique_lock<boost::timed_mutex> lk(m, Clock::now() + ms(250));
BOOST_TEST(lk.owns_lock() == false);
t1 = Clock::now();
ns d = t1 - t0 - ms(250);
BOOST_TEST(d < max_diff);
ms d = boost::chrono::duration_cast<boost::chrono::milliseconds>(t1 - t0) - ms(250);
BOOST_THREAD_TEST_IT(d, ns(max_diff));
}

int main()
Expand Down
Loading