Fix hanging builds

zefiros-software · Aug 14, 2016 · dfd0c8c · dfd0c8c
1 parent 8db7abb
commit dfd0c8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bsp/include/bsp/mixedBarrier.h b/bsp/include/bsp/mixedBarrier.h
@@ -114,7 +114,7 @@ namespace BSPInternal
                 if ( i >= BSP_SPIN_ITERATIONS )
                 {
                     std::unique_lock< std::mutex > condVarLoc( mCondVarMutex );
-                    mCurrentCon->wait( condVarLoc, [&] {return mGeneration != myGeneration;} );
+                    mCurrentCon->wait( condVarLoc, [&] {return mGeneration != myGeneration && !aborted;} );
                 }
             }
 

diff --git a/test/testClassic.h b/test/testClassic.h
@@ -100,7 +100,7 @@ inline void AbortTestAllWaitExceptOne()
 
     if ( BSPLib::ProcId() == 1 )
     {
-        std::this_thread::sleep_for( std::chrono::milliseconds( 200 ) );
+        std::this_thread::sleep_for( std::chrono::milliseconds( 1 ) );
         BSPLib::Classic::Abort( "" );
     }
 
@@ -118,7 +118,7 @@ inline void AbortTestAllWaitExceptMain()
 
     if ( BSPLib::ProcId() == 0 )
     {
-        std::this_thread::sleep_for( std::chrono::milliseconds( 200 ) );
+        std::this_thread::sleep_for( std::chrono::milliseconds( 1 ) );
         BSPLib::Classic::Abort( "" );
     }
 
@@ -127,7 +127,7 @@ inline void AbortTestAllWaitExceptMain()
 
 TEST( P( Classic ), AbortTestAllWaitExceptMain )
 {
-    EXPECT_FALSE( BSPLib::Execute( AbortTestAllWaitExceptMain, 8 ) );
+    EXPECT_FALSE( BSPLib::Execute( AbortTestAllWaitExceptMain, BSPLib::NProcs() ) );
 }
 
 inline void EmptyTest()