change to use better regex for initial find. Update paths correctly.

1 files changed, 7 insertions, 7 deletions

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