diff options
author | Tom Gall <tom.gall@linaro.org> | 2013-03-27 11:16:02 -0500 |
---|---|---|
committer | Tom Gall <tom.gall@linaro.org> | 2013-03-27 11:16:02 -0500 |
commit | fd609be56a76f3c26d36cdfd49aa6ec289b5c4cf (patch) | |
tree | a079ef129bb6a1008d5795a5b3338492cc238e8d | |
parent | 25f59b687bc407cba9db951010ed54e2fe53aee0 (diff) |
change to use better regex for initial find. Update paths correctly.
-rw-r--r-- | android/glslparser_gles2.yaml | 2 | ||||
-rwxr-xr-x | android/scripts/piglit-run-glslparser.sh | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/android/glslparser_gles2.yaml b/android/glslparser_gles2.yaml index cd4b202..01e48cc 100644 --- a/android/glslparser_gles2.yaml +++ b/android/glslparser_gles2.yaml @@ -16,7 +16,7 @@ run: - "./homescreen.sh" - "cd $START_DIR" - "cd test-definitions/android/scripts" - - "./piglit-run-glslparser.sh /system/xbin/piglit/piglit-shader-test/glslparsertest_gles2 /data/glslparser-data" + - "./piglit-run-glslparser.sh /system/xbin/piglit/glslparsertest/glslparsertest_gles2 /data/glslparser-data" parse: pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))" diff --git a/android/scripts/piglit-run-glslparser.sh b/android/scripts/piglit-run-glslparser.sh index 3a7325b..2673291 100755 --- a/android/scripts/piglit-run-glslparser.sh +++ b/android/scripts/piglit-run-glslparser.sh @@ -4,7 +4,7 @@ set -x # find and loop over the vert and frag tests found # looks recursively down the directory tree -find ${2} -name *.vert -or -name *.frag -print0 | while read -d $'\0' file +find ${2} -regex ".*\.\(vert\|frag\)" -print0 | while read -d $'\0' file do RESULTEXPECTED=$(grep expect_result ${file} ) case $RESULTEXPECTED in @@ -24,22 +24,22 @@ do case $RESULT in *"$PSTRING"*) if $RESULTEXPECTED = "pass"; then - echo "${1}: pass" + echo "${1} ${file}: pass" else - echo "${1}: fail" + echo "${1} ${file}: fail" fi ;; - *"$SSTRING"*) echo "${1}: skip";; + *"$SSTRING"*) echo "${1} ${file}: skip";; *"$FSTRING"*) if $RESULTEXPECTED = "fail"; then - echo "${1}: pass" + echo "${1} ${file}: pass" else - echo "${1}: fail" + echo "${1} ${file}: fail" fi ;; - *) echo "${1}: fail";; + *) echo "${1} ${file}: fail";; esac done |