diff --git a/util/test/rdtest/testcase.py b/util/test/rdtest/testcase.py index 580dd6acb..09a22c5ce 100644 --- a/util/test/rdtest/testcase.py +++ b/util/test/rdtest/testcase.py @@ -135,6 +135,7 @@ class TestCase: demos_test_name = '' demos_frame_cap = 5 demos_frame_count = 1 + demos_timeout = None demos_captures_expected = None _test_list = {} @@ -208,10 +209,13 @@ class TestCase: if self.demos_test_name != '': logfile = os.path.join(util.get_tmp_dir(), 'demos.log') + timeout = self.demos_timeout + if timeout is None: + timeout = util.get_demos_timeout() return capture.run_and_capture(util.get_demos_binary(), self.demos_test_name + " --log " + logfile, self.demos_frame_cap, frame_count=self.demos_frame_count, captures_expected=self.demos_captures_expected, logfile=logfile, - opts=self.get_capture_options(), timeout=util.get_demos_timeout()) + opts=self.get_capture_options(), timeout=timeout) raise NotImplementedError("If run() is not implemented in a test, then" "get_capture() and check_capture() must be.") diff --git a/util/test/tests/D3D11/D3D11_Leak_Check.py b/util/test/tests/D3D11/D3D11_Leak_Check.py index 03977f22d..2c1fb93b2 100644 --- a/util/test/tests/D3D11/D3D11_Leak_Check.py +++ b/util/test/tests/D3D11/D3D11_Leak_Check.py @@ -6,6 +6,7 @@ class D3D11_Leak_Check(rdtest.TestCase): demos_test_name = 'D3D11_Leak_Check' demos_frame_cap = 50000 demos_frame_count = 10 + demos_timeout = 120 def check_capture(self): memory: int = rd.GetCurrentProcessMemoryUsage() diff --git a/util/test/tests/D3D12/D3D12_Leak_Check.py b/util/test/tests/D3D12/D3D12_Leak_Check.py index e8275260a..48605c609 100644 --- a/util/test/tests/D3D12/D3D12_Leak_Check.py +++ b/util/test/tests/D3D12/D3D12_Leak_Check.py @@ -6,6 +6,7 @@ class D3D12_Leak_Check(rdtest.TestCase): demos_test_name = 'D3D12_Leak_Check' demos_frame_cap = 50000 demos_frame_count = 10 + demos_timeout = 120 def check_capture(self): memory: int = rd.GetCurrentProcessMemoryUsage() diff --git a/util/test/tests/GL/GL_Leak_Check.py b/util/test/tests/GL/GL_Leak_Check.py index 58b1b7622..642c049f2 100644 --- a/util/test/tests/GL/GL_Leak_Check.py +++ b/util/test/tests/GL/GL_Leak_Check.py @@ -6,6 +6,7 @@ class GL_Leak_Check(rdtest.TestCase): demos_test_name = 'GL_Leak_Check' demos_frame_cap = 50000 demos_frame_count = 1 + demos_timeout = 120 def check_capture(self): memory: int = rd.GetCurrentProcessMemoryUsage() diff --git a/util/test/tests/Vulkan/VK_Leak_Check.py b/util/test/tests/Vulkan/VK_Leak_Check.py index 9d38980a6..368dfa3f0 100644 --- a/util/test/tests/Vulkan/VK_Leak_Check.py +++ b/util/test/tests/Vulkan/VK_Leak_Check.py @@ -6,6 +6,7 @@ class VK_Leak_Check(rdtest.TestCase): demos_test_name = 'VK_Leak_Check' demos_frame_cap = 50000 demos_frame_count = 10 + demos_timeout = 120 def check_capture(self): memory: int = rd.GetCurrentProcessMemoryUsage()