From f6a913bb9540a9c3fa5a22ad5e08dfe87dafdaaf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Wed, 20 Nov 2019 11:15:04 +0100 Subject: [PATCH] glsl/tests: Use splitlines() instead of strip() strip() removes leading and trailing newlines, but leaves newlines between multiple lines in the string. This could cause failures when comparing the output of cross-compiled Windows binaries (producing Windows-style newlines) to the expected output with Unix-style newlines. Reviewed-by: Dylan Baker --- src/compiler/glsl/tests/warnings_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/glsl/tests/warnings_test.py b/src/compiler/glsl/tests/warnings_test.py index ed0774880d3..6cd3fbf294f 100644 --- a/src/compiler/glsl/tests/warnings_test.py +++ b/src/compiler/glsl/tests/warnings_test.py @@ -65,11 +65,11 @@ def main(): file = os.path.join(args.test_directory, file) with open('{}.expected'.format(file), 'rb') as f: - expected = f.read().strip() + expected = f.read().splitlines() actual = subprocess.check_output( runner + ['--just-log', '--version', '150', file] - ).strip() + ).splitlines() if actual == expected: print('PASS') -- 2.30.2