diff --git a/util/test/rdtest/shared/Subgroup_Zoo.py b/util/test/rdtest/shared/Subgroup_Zoo.py index 7fb817b6a..72c53801d 100644 --- a/util/test/rdtest/shared/Subgroup_Zoo.py +++ b/util/test/rdtest/shared/Subgroup_Zoo.py @@ -274,6 +274,6 @@ class Subgroup_Zoo(rdtest.TestCase): if overallFailed: raise rdtest.TestFailureException("Some tests were not as expected") - self.check_renderdoc_log() + self.check_renderdoc_log_asserts() rdtest.log.success("All tests matched") \ No newline at end of file diff --git a/util/test/rdtest/shared/Workgroup_Zoo.py b/util/test/rdtest/shared/Workgroup_Zoo.py index ce2891817..ca9a7aa9a 100644 --- a/util/test/rdtest/shared/Workgroup_Zoo.py +++ b/util/test/rdtest/shared/Workgroup_Zoo.py @@ -27,6 +27,6 @@ class Workgroup_Zoo(rdtest.Subgroup_Zoo): if self.check_compute_tests(compute_dims, thread_checks): raise rdtest.TestFailureException("Some tests were not as expected") - self.check_renderdoc_log() + self.check_renderdoc_log_asserts() rdtest.log.success("All tests matched") \ No newline at end of file diff --git a/util/test/rdtest/testcase.py b/util/test/rdtest/testcase.py index 73ef220c0..112860833 100644 --- a/util/test/rdtest/testcase.py +++ b/util/test/rdtest/testcase.py @@ -893,17 +893,13 @@ class TestCase: taskIdx += 1 return data - def check_renderdoc_log(self, asserts: bool = True, errors: bool = True): + def check_renderdoc_log_asserts(self): countAsserts = 0 - countErrors = 0 rdlog = rd.GetLogFile() with open(rdlog, 'r') as f: for line in f: - if asserts and 'Assertion' in line: + if 'Assertion' in line: log.error(line) countAsserts += 1 - elif errors and 'Error' in line: - log.error(line) - countErrors += 1 - if countAsserts > 0 or countErrors > 0: - raise TestFailureException(f'Renderdoc log file contains {countAsserts} Asserts and {countErrors} Errors') + if countAsserts > 0: + raise TestFailureException(f'Renderdoc log file contains {countAsserts} Asserts') diff --git a/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py b/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py index 988f03470..d252cec63 100644 --- a/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py +++ b/util/test/tests/D3D12/D3D12_Shader_DebugData_Zoo.py @@ -227,6 +227,6 @@ class D3D12_Shader_DebugData_Zoo(rdtest.TestCase): if failed: raise rdtest.TestFailureException("Some tests were not as expected") - self.check_renderdoc_log() + self.check_renderdoc_log_asserts() rdtest.log.success("All tests matched")