diff --git a/CMake/GitExternal.cmake b/CMake/GitExternal.cmake index 90e988462..ebf107594 100644 --- a/CMake/GitExternal.cmake +++ b/CMake/GitExternal.cmake @@ -13,7 +13,7 @@ function(GIT_EXTERNAL DIR REPO TAG) get_filename_component(GIT_EXTERNAL_DIR "${DIR}/.." ABSOLUTE) if(NOT EXISTS "${DIR}") - message("git clone ${REPO} ${DIR}") + message(STATUS "git clone ${REPO} ${DIR}") execute_process( COMMAND "${GIT_EXECUTABLE}" clone "${REPO}" "${DIR}" RESULT_VARIABLE nok ERROR_VARIABLE error @@ -39,7 +39,7 @@ function(GIT_EXTERNAL DIR REPO TAG) RESULT_VARIABLE nok ERROR_VARIABLE error WORKING_DIRECTORY "${DIR}") if(nok) - message(WARNING "Update of ${DIR} failed: ${error}\n") + message(STATUS "Update of ${DIR} failed:\n ${error}") endif() execute_process( diff --git a/tests/issue38.cpp b/tests/issue38.cpp index a05a8d873..723f6b3b6 100644 --- a/tests/issue38.cpp +++ b/tests/issue38.cpp @@ -41,10 +41,10 @@ class Writer : public lunchbox::Thread : runtime( 0.f ) {} - void start( co::ConnectionPtr connection ) + void startSend( co::ConnectionPtr connection ) { connection_ = connection; - TEST( lunchbox::Thread::start( )); + TEST( start( )); } void run() override @@ -89,7 +89,7 @@ int main( int argc, char **argv ) TEST( reader ); set.addConnection( reader ); - threads[i].start( writers[i] ); + threads[i].startSend( writers[i] ); } co::Buffer buffer; @@ -109,11 +109,12 @@ int main( int argc, char **argv ) } const float runtime = threads[0].runtime; + const float delta = runtime / 10.f; for( size_t i = 0; i < NCONNECTIONS; ++i ) { threads[i].join(); writers[i]->close(); - TESTINFO( std::abs( threads[i].runtime - runtime ) < 10.f , + TESTINFO( std::abs( threads[i].runtime - runtime ) < delta , threads[i].runtime << " != " << runtime ); }