Magellan Linux

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

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

revision 1720 by niro, Sat Feb 18 00:51:28 2012 UTC revision 1737 by niro, Sat Feb 18 01:02:56 2012 UTC
# Line 74  oneTest() { Line 74  oneTest() {
74  oneDisplayTest() {  oneDisplayTest() {
75      typeset mode=$1 cfg=test/$2 correct=test/results/$3      typeset mode=$1 cfg=test/$2 correct=test/results/$3
76      shift 3      shift 3
77        local BIO="--bad-image-okay"
78        if [ "$1" == "--bad-image-bad" ]; then
79            BIO=""
80            shift
81        fi
82    
83      echo "$testing ... $mode $cfg $correct"      echo "$testing ... $mode $cfg $correct"
84      runme=( ./grubby "$mode" --bad-image-okay -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 -------------------------------------------------------------
# Line 211  grubDisplayTest grub.9 defaultindex/0 -- Line 216  grubDisplayTest grub.9 defaultindex/0 --
216  grubDisplayTest grub.10 defaultindex/0 --default-index  grubDisplayTest grub.10 defaultindex/0 --default-index
217  grubDisplayTest grub.10 defaultindex/0 --default-index  grubDisplayTest grub.10 defaultindex/0 --default-index
218    
219    testing="GRUB display default title"
220    grubDisplayTest grub.1 defaulttitle/g.1 --default-title
221    grubDisplayTest grub.2 defaulttitle/g.2 --default-title
222    grubDisplayTest grub.3 defaulttitle/g.3 --default-title
223    grubDisplayTest grub.4 defaulttitle/g.4 --default-title
224    grubDisplayTest grub.5 defaulttitle/g.5 --default-title
225    grubDisplayTest grub.6 defaulttitle/g.6 --default-title
226    grubDisplayTest grub.7 defaulttitle/g.7 --default-title
227    grubDisplayTest grub.8 defaulttitle/g.8 --default-title
228    grubDisplayTest grub.9 defaulttitle/g.9 --default-title
229    grubDisplayTest grub.10 defaulttitle/g.10 --default-title
230    grubDisplayTest grub.11 defaulttitle/g.11 --default-title
231    
232  testing="LILO default directive"  testing="LILO default directive"
233  liloTest lilo.1 default/l1.1 --set-default=/boot/vmlinuz-2.4.18-4  liloTest lilo.1 default/l1.1 --set-default=/boot/vmlinuz-2.4.18-4
234  liloTest lilo.1 default/l1.2 --remove-kernel=/boot/vmlinuz-2.4.18-4smp  liloTest lilo.1 default/l1.2 --remove-kernel=/boot/vmlinuz-2.4.18-4smp
# Line 350  grub2Test grub2.1 add/g2-1.2 --add-kerne Line 368  grub2Test grub2.1 add/g2-1.2 --add-kerne
368      --copy-default --make-default      --copy-default --make-default
369  grub2Test grub2.1 add/g2-1.3 --add-kernel=/boot/new-kernel.img --title='title' \  grub2Test grub2.1 add/g2-1.3 --add-kernel=/boot/new-kernel.img --title='title' \
370      --boot-filesystem=/boot/ --copy-default --make-default      --boot-filesystem=/boot/ --copy-default --make-default
371    grub2Test grub2.1 remove/g2-1.4 --remove-kernel=/boot/vmlinuz-2.6.38.2-9.fc15.x86_64 \
372        --boot-filesystem=/boot/
373    
374  testing="GRUB2 add initrd"  testing="GRUB2 add initrd"
375  grub2Test grub2.2 add/g2-1.4 --update-kernel=/boot/new-kernel.img \  grub2Test grub2.2 add/g2-1.4 --update-kernel=/boot/new-kernel.img \
# Line 359  testing="GRUB2 display default index" Line 379  testing="GRUB2 display default index"
379  grub2DisplayTest grub2.1 defaultindex/0 --default-index  grub2DisplayTest grub2.1 defaultindex/0 --default-index
380  grub2DisplayTest grub2.2 defaultindex/0 --default-index  grub2DisplayTest grub2.2 defaultindex/0 --default-index
381    
382    testing="GRUB2 display default title"
383    grub2DisplayTest grub2.1 defaulttitle/g2.1 --default-title
384    grub2DisplayTest grub2.2 defaulttitle/g2.2 --default-title
385    
386    testing="GRUB2 display debug failure"
387    grub2DisplayTest grub2.1 debug/g2.1 --bad-image-bad --default-kernel --debug
388    testing="GRUB2 display debug success"
389    grub2DisplayTest grub2.1 debug/g2.1.2 --default-kernel --debug
390    
391  testing="YABOOT add kernel"  testing="YABOOT add kernel"
392  yabootTest yaboot.1 add/y1.1 --copy-default --boot-filesystem=/ --add-kernel=/boot/new-kernel  \  yabootTest yaboot.1 add/y1.1 --copy-default --boot-filesystem=/ --add-kernel=/boot/new-kernel  \
393      --title=newtitle      --title=newtitle

Legend:
Removed from v.1720  
changed lines
  Added in v.1737