Magellan Linux

Diff of /tags/grubby-8_32/test.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1837 by niro, Mon Jul 2 12:46:11 2012 UTC revision 1856 by niro, Mon Jul 2 13:13:49 2012 UTC
# Line 82  oneDisplayTest() { Line 82  oneDisplayTest() {
82    
83      echo "$testing ... $mode $cfg $correct"      echo "$testing ... $mode $cfg $correct"
84      runme=( ./grubby "$mode" $BIO -c "$cfg" "$@" )      runme=( ./grubby "$mode" $BIO -c "$cfg" "$@" )
85      if "${runme[@]}" |& cmp "$correct" > /dev/null; then      if "${runme[@]}" 2>&1 | cmp "$correct" > /dev/null; then
86   (( pass++ ))   (( pass++ ))
87   if $opt_verbose; then   if $opt_verbose; then
88      echo -------------------------------------------------------------      echo -------------------------------------------------------------
89      echo -n "PASS: "      echo -n "PASS: "
90      printf "%q " "${runme[@]}"; echo      printf "%q " "${runme[@]}"; echo
91      "${runme[@]}" |& diff -U30 "$cfg" -      "${runme[@]}" 2>&1 | diff -U30 "$cfg" -
92      echo      echo
93   fi   fi
94      else      else
# Line 96  oneDisplayTest() { Line 96  oneDisplayTest() {
96   echo -------------------------------------------------------------   echo -------------------------------------------------------------
97   echo -n "FAIL: "   echo -n "FAIL: "
98   printf "%q " "${runme[@]}"; echo   printf "%q " "${runme[@]}"; echo
99   "${runme[@]}" |& diff -U30 "$correct" -   "${runme[@]}" 2>&1 | diff -U30 "$correct" -
100   echo   echo
101      fi      fi
102  }  }

Legend:
Removed from v.1837  
changed lines
  Added in v.1856