summaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2019-11-20 11:15:04 +0100
committerMichel Dänzer <[email protected]>2019-12-05 12:31:17 +0100
commitf6a913bb9540a9c3fa5a22ad5e08dfe87dafdaaf (patch)
tree533d30ac8c514b9de9dd440b56012bf5a6f79641 /src/compiler
parent96aef08dc6f4ea4a79cdf995d867d08e8f838b2a (diff)
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 <[email protected]>
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/glsl/tests/warnings_test.py4
1 files 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')