From: Dylan Baker Date: Fri, 31 May 2019 17:13:55 +0000 (-0700) Subject: glsl/tests: Handle windows \r\n new lines X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=26961e2cb5e20a1d56915d903f8f03391b4fd109;p=mesa.git glsl/tests: Handle windows \r\n new lines Currently the praser for s expressions assumes that newlines will be \n, resulting in incorrect parsing on windows, where the newline is \r\n. This patch just adds \r? to the regular expression used to parse the s expressions, which fixes at 1 test on windows. Reviewed-by: Eric Engestrom --- diff --git a/src/compiler/glsl/tests/sexps.py b/src/compiler/glsl/tests/sexps.py index 7939b42f9a2..7de5db39be6 100644 --- a/src/compiler/glsl/tests/sexps.py +++ b/src/compiler/glsl/tests/sexps.py @@ -52,7 +52,7 @@ def parse_sexp(sexp): into a sexp represented as nested lists containing strings. """ sexp_token_regexp = re.compile( - '[a-zA-Z_]+(@[0-9]+)?|[0-9]+(\\.[0-9]+)?|[^ \n]') + '[a-zA-Z_]+(@[0-9]+)?|[0-9]+(\\.[0-9]+)?|[^ \r?\n]') stack = [[]] for match in sexp_token_regexp.finditer(sexp): token = match.group(0)