Merge "Make mutex test variables volatile to prevent potential errors cused by optimi...

diff --git a/automated-tests/src/dali-devel/utc-Dali-Mutex.cpp b/automated-tests/src/dali-devel/utc-Dali-Mutex.cpp
index 2911d6c..60fdaaf 100644 (file)
--- a/automated-tests/src/dali-devel/utc-Dali-Mutex.cpp
+++ b/automated-tests/src/dali-devel/utc-Dali-Mutex.cpp
@@ -50,10 +50,11 @@ int UtcDaliMutexSingleThread(void)
 
 namespace // for local variables to avoid name clashes
 {
-int gGlobalValue = 0;
-Mutex* gGlobalValueMutex;
-bool gWorkerThreadWait = true;
-enum ThreadState { INIT, RUN, LOCKING, TERMINATE } gWorkerThreadState = INIT;
+// make all these volatile to pre-empt any optimization screwing up the logic
+volatile int gGlobalValue = 0;
+volatile bool gWorkerThreadWait = true;
+volatile enum ThreadState { INIT, RUN, LOCKING, TERMINATE } gWorkerThreadState = INIT;
+Mutex* volatile gGlobalValueMutex; // volatile pointer to a mutex object
 }
 void* WorkerThread1( void* ptr )
 {