Magellan Linux

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

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

revision 1698 by niro, Sat Feb 18 00:16:24 2012 UTC revision 1727 by niro, Sat Feb 18 00:57:49 2012 UTC
# Line 69  oneTest() { Line 69  oneTest() {
69      fi      fi
70  }  }
71    
72    # Test feature that display some information, checking that output instead of
73    # the generated configuration file
74    oneDisplayTest() {
75        typeset mode=$1 cfg=test/$2 correct=test/results/$3
76        shift 3
77    
78        echo "$testing ... $mode $cfg $correct"
79        runme=( ./grubby "$mode" --bad-image-okay -c "$cfg" "$@" )
80        if "${runme[@]}" | cmp "$correct" > /dev/null; then
81     (( pass++ ))
82     if $opt_verbose; then
83        echo -------------------------------------------------------------
84        echo -n "PASS: "
85        printf "%q " "${runme[@]}"; echo
86        "${runme[@]}" | diff -U30 "$cfg" -
87        echo
88     fi
89        else
90     (( fail++ ))
91     echo -------------------------------------------------------------
92     echo -n "FAIL: "
93     printf "%q " "${runme[@]}"; echo
94     "${runme[@]}" | diff -U30 "$correct" -
95     echo
96        fi
97    }
98    
99  # generate convenience functions  # generate convenience functions
100  for b in $(./grubby --help | \  for b in $(./grubby --help | \
101   sed -n 's/^.*--\([^ ]*\) *configure \1 bootloader$/\1/p'); do   sed -n 's/^.*--\([^ ]*\) *configure \1 bootloader$/\1/p'); do
102      eval "${b}Test() { [[ \"$b\" == \$opt_bootloader ]] && oneTest --$b \"\$@\"; }"      eval "${b}Test() { [[ \"$b\" == \$opt_bootloader ]] && oneTest --$b \"\$@\"; }"
103        eval "${b}DisplayTest() { [[ \"$b\" == \$opt_bootloader ]] && oneDisplayTest --$b \"\$@\"; }"
104  done  done
105    
106  #----------------------------------------------------------------------  #----------------------------------------------------------------------
# Line 170  grubTest grub.4 default/g4.1 --boot-file Line 198  grubTest grub.4 default/g4.1 --boot-file
198  grubTest grub.4 default/g4.2 --boot-filesystem=/ --set-default=/boot/vmlinuz-2.4.7-ac3 --remove-kernel /boot/vmlinuz-2.4.7-2.5 --add-kernel=/boot/new-kernel --copy-default --title New_Title  grubTest grub.4 default/g4.2 --boot-filesystem=/ --set-default=/boot/vmlinuz-2.4.7-ac3 --remove-kernel /boot/vmlinuz-2.4.7-2.5 --add-kernel=/boot/new-kernel --copy-default --title New_Title
199  grubTest grub.6 default/g6.1 --remove-kernel=/boot/vmlinuz-2.4.7-2.9 --boot-filesystem=/  grubTest grub.6 default/g6.1 --remove-kernel=/boot/vmlinuz-2.4.7-2.9 --boot-filesystem=/
200    
201    testing="GRUB display default index"
202    grubDisplayTest grub.1 defaultindex/0 --default-index
203    grubDisplayTest grub.2 defaultindex/0 --default-index
204    grubDisplayTest grub.3 defaultindex/0 --default-index
205    grubDisplayTest grub.4 defaultindex/0 --default-index
206    grubDisplayTest grub.5 defaultindex/0 --default-index
207    grubDisplayTest grub.6 defaultindex/2 --default-index
208    grubDisplayTest grub.7 defaultindex/2 --default-index
209    grubDisplayTest grub.8 defaultindex/0 --default-index
210    grubDisplayTest grub.9 defaultindex/0 --default-index
211    grubDisplayTest grub.10 defaultindex/0 --default-index
212    grubDisplayTest grub.10 defaultindex/0 --default-index
213    
214    testing="GRUB display default title"
215    grubDisplayTest grub.1 defaulttitle/g.1 --default-title
216    grubDisplayTest grub.2 defaulttitle/g.2 --default-title
217    grubDisplayTest grub.3 defaulttitle/g.3 --default-title
218    grubDisplayTest grub.4 defaulttitle/g.4 --default-title
219    grubDisplayTest grub.5 defaulttitle/g.5 --default-title
220    grubDisplayTest grub.6 defaulttitle/g.6 --default-title
221    grubDisplayTest grub.7 defaulttitle/g.7 --default-title
222    grubDisplayTest grub.8 defaulttitle/g.8 --default-title
223    grubDisplayTest grub.9 defaulttitle/g.9 --default-title
224    grubDisplayTest grub.10 defaulttitle/g.10 --default-title
225    grubDisplayTest grub.11 defaulttitle/g.11 --default-title
226    
227  testing="LILO default directive"  testing="LILO default directive"
228  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
229  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 309  grub2Test grub2.1 add/g2-1.2 --add-kerne Line 363  grub2Test grub2.1 add/g2-1.2 --add-kerne
363      --copy-default --make-default      --copy-default --make-default
364  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' \
365      --boot-filesystem=/boot/ --copy-default --make-default      --boot-filesystem=/boot/ --copy-default --make-default
366    grub2Test grub2.1 remove/g2-1.4 --remove-kernel=/boot/vmlinuz-2.6.38.2-9.fc15.x86_64 \
367        --boot-filesystem=/boot/
368    
369  testing="GRUB2 add initrd"  testing="GRUB2 add initrd"
370  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 \
371      --initrd=/boot/new-initrd --boot-filesystem=/boot/      --initrd=/boot/new-initrd --boot-filesystem=/boot/
372    
373    testing="GRUB2 display default index"
374    grub2DisplayTest grub2.1 defaultindex/0 --default-index
375    grub2DisplayTest grub2.2 defaultindex/0 --default-index
376    
377    testing="GRUB display default title"
378    grub2DisplayTest grub2.1 defaulttitle/g2.1 --default-title
379    grub2DisplayTest grub2.2 defaulttitle/g2.2 --default-title
380    
381  testing="YABOOT add kernel"  testing="YABOOT add kernel"
382  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  \
383      --title=newtitle      --title=newtitle

Legend:
Removed from v.1698  
changed lines
  Added in v.1727