<div dir="ltr">On 21 January 2013 19:50, Tom Gall <span dir="ltr"><<a href="mailto:tom.gall@linaro.org" target="_blank">tom.gall@linaro.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
When shader_runner parses the shader_test data file, only<br>
parse one [required] section, no longer parse the rest of the file.<br>
<br>
v2: better description. Remove warning.<br>
<br>
Signed-off-by: Tom Gall <<a href="mailto:tom.gall@linaro.org">tom.gall@linaro.org</a>><br></blockquote><div><br></div><div>Ok, I've pushed these two patches. Sorry for the delay.<br><br></div><div>BTW, I took the liberty of adding colons to the patch subjects so that they're easier to read:<br>
<br>shader_runner.py: Update regex to detect new require section syntax<br>shader_runner.c: only read one [require] section<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
---<br>
tests/shaders/shader_runner.c | 8 ++++++--<br>
1 file changed, 6 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c<br>
index 8dfeb2a..d83228e 100644<br>
--- a/tests/shaders/shader_runner.c<br>
+++ b/tests/shaders/shader_runner.c<br>
@@ -868,8 +868,12 @@ parse_required_versions(struct requirement_parse_results *results,<br>
}<br>
<br>
while (line[0] != '\0') {<br>
- if (line[0] == '[')<br>
- in_requirement_section = false;<br>
+ if (line[0] == '[') {<br>
+ if (in_requirement_section)<br>
+ break;<br>
+ else<br>
+ in_requirement_section = false;<br>
+ }<br>
<br>
if (!in_requirement_section) {<br>
if (string_match("[require]", line)) {<br>
<span class=""><font color="#888888">--<br>
1.7.10.4<br>
<br>
_______________________________________________<br>
Piglit mailing list<br>
<a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a><br>
</font></span></blockquote></div><br></div></div>