From: Kalle Raita <kraita@google.com>
Date: Fri, 28 Apr 2017 23:26:40 +0000 (-0700)
Subject: Merge commit '9bd0272d004aabece70774113d1ff6d9dbf1301c' into HEAD
X-Git-Tag: upstream/0.1.0~150^2~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e532829e0ca6feb4cbae98b3e0ee0b429dd7567;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge commit '9bd0272d004aabece70774113d1ff6d9dbf1301c' into HEAD

Test: check_build_sanity.py
Change-Id: I83a7e6b3626bcf5a51af5a4bfe49f727bd2c4da1
---

8e532829e0ca6feb4cbae98b3e0ee0b429dd7567
diff --cc framework/common/tcuApp.cpp
index 075d505,7c49f7f..d99617f
--- a/framework/common/tcuApp.cpp
+++ b/framework/common/tcuApp.cpp
@@@ -204,15 -203,10 +204,15 @@@ bool App::iterate (void
  	return platformOk && testExecOk;
  }
  
 +const TestRunStatus& App::getResult (void) const
 +{
 +	return m_testExecutor->getStatus();
 +}
 +
- void App::onWatchdogTimeout (qpWatchDog* watchDog, void* userPtr)
+ void App::onWatchdogTimeout (qpWatchDog* watchDog, void* userPtr, qpTimeoutReason reason)
  {
  	DE_UNREF(watchDog);
- 	static_cast<App*>(userPtr)->onWatchdogTimeout();
+ 	static_cast<App*>(userPtr)->onWatchdogTimeout(reason);
  }
  
  void App::onCrash (qpCrashHandler* crashHandler, void* userPtr)