From: Peter Quayle <peter.quayle@imgtec.com>
Date: Fri, 28 Sep 2018 16:10:04 +0000 (+0100)
Subject: Fix timeout in dEQP-VK.wsi.android test
X-Git-Tag: upstream/1.3.5~2324^2~20^2^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8752515c1720d410697d6c20ac31c2bc1619715;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix timeout in dEQP-VK.wsi.android test

Changes in Android P have causes the workload in
dEQP-VK.wsi.android.swapchain.simulate_oom.min_image_count
to increase significantly, leading to timeouts on some platforms.
This is worked around by simply touching the watchdog timer
between cases.

Affects:

dEQP-VK.wsi.android.swapchain.simulate_oom.min_image_count

Components: Vulkan

VK-GL-CTS issue: 1383

Change-Id: If5da804796f85acd3c2b9709a5463951609168dc
---

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
index e1a23f6..8a435fc 100644
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
@@ -655,9 +655,9 @@ tcu::TestStatus createSwapchainSimulateOOMTest (Context& context, TestParameters
 				else if (numPassingAllocs == maxAllocs)
 					results.addResult(QP_TEST_RESULT_QUALITY_WARNING, "Creating swapchain did not succeed, callback limit exceeded");
 			}
-		}
 
-		context.getTestContext().touchWatchdog();
+			context.getTestContext().touchWatchdog();
+		}
 	}
 
 	if (!validateAndLog(log, allocationRecorder, 0u))