Parcourir la source

Merge remote-tracking branch 'upstream/development' into AssimpLoaader-Fix

marauder2k7 il y a 1 an
Parent
commit
b7f9687a9d
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2 2
      Engine/source/testing/threadSafeDequeTest.cpp

+ 2 - 2
Engine/source/testing/threadSafeDequeTest.cpp

@@ -177,9 +177,9 @@ TEST_FIX(ThreadSafeDeque, PopBack)
 }
 
 // Test many items in a row
-TEST_FIX(ThreadSafeDeque, Concurrent)
+TEST_FIX(ThreadSafeDeque, DISABLED_Concurrent)
 {
-   const U32 NumValues = 100;
+   const U32 NumValues = 50;
 
    Deque mDeque;
    Vector<U32> mValues;