From a4b8f69bb50556bf3e5c41b887c74c8ef6d9fd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Wed, 19 Jan 2022 11:55:54 +0100 Subject: [PATCH] radv/ci: add line endings exception for files generated with wine Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/ci/.gitattributes | 1 + src/amd/ci/vkd3d-proton-navy_flounder.txt | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 src/amd/ci/.gitattributes diff --git a/src/amd/ci/.gitattributes b/src/amd/ci/.gitattributes new file mode 100644 index 00000000000..a72c1c90632 --- /dev/null +++ b/src/amd/ci/.gitattributes @@ -0,0 +1 @@ +vkd3d-*.txt eol=crlf diff --git a/src/amd/ci/vkd3d-proton-navy_flounder.txt b/src/amd/ci/vkd3d-proton-navy_flounder.txt index f10db93a1a8..88430fc14e7 100644 --- a/src/amd/ci/vkd3d-proton-navy_flounder.txt +++ b/src/amd/ci/vkd3d-proton-navy_flounder.txt @@ -1,10 +1,10 @@ -d3d12:23926: Test failed: PSInvocations: Got 256, expected >= 1024. -d3d12:30894: Test failed: Got 0xffffffff, expected 0xff9bc864 at (0, 0, 0). -d3d12:37735: Test failed: Got 0xff00ff00, expected 0xffffffff at (0, 0, 0). -d3d12:43170:test 7: Test failed: Failed to create reserved resource, hr 0x80070057. -d3d12:43170:test 8: Test failed: Failed to create reserved resource, hr 0x80070057. -d3d12:43973:Test 3: Test failed: Got color 0x00000000, expected 0xccb3804d. -d3d12:46546:Test 12: Test failed: Inconsistent GPU timestamps. -d3d12:46547:Test 12: Test failed: Inconsistent CPU timestamps. -d3d12:46633:Test 12: Test failed: Failed to open heap from file mapping: hr #8007000e. -d3d12:50060:Test 12: Test failed: Got hr 0x8007000e, expected 0. +d3d12:23926: Test failed: PSInvocations: Got 256, expected >= 1024. +d3d12:30894: Test failed: Got 0xffffffff, expected 0xff9bc864 at (0, 0, 0). +d3d12:37735: Test failed: Got 0xff00ff00, expected 0xffffffff at (0, 0, 0). +d3d12:43170:test 7: Test failed: Failed to create reserved resource, hr 0x80070057. +d3d12:43170:test 8: Test failed: Failed to create reserved resource, hr 0x80070057. +d3d12:43973:Test 3: Test failed: Got color 0x00000000, expected 0xccb3804d. +d3d12:46546:Test 12: Test failed: Inconsistent GPU timestamps. +d3d12:46547:Test 12: Test failed: Inconsistent CPU timestamps. +d3d12:46633:Test 12: Test failed: Failed to open heap from file mapping: hr #8007000e. +d3d12:50060:Test 12: Test failed: Got hr 0x8007000e, expected 0.