Magellan Linux

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

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

trunk/mkinitrd-magellan/grubby/test.sh revision 1308 by niro, Fri May 27 17:35:32 2011 UTC trunk/grubby/test.sh revision 1719 by niro, Sat Feb 18 00:50:18 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 301  grubTest grub.11 add/g11.1 --add-kernel= Line 329  grubTest grub.11 add/g11.1 --add-kernel=
329      --initrd=/boot/new-initrd --boot-filesystem=/boot --copy-default \      --initrd=/boot/new-initrd --boot-filesystem=/boot --copy-default \
330      --args='console=tty0 console=ttyS1,9600n81 single'      --args='console=tty0 console=ttyS1,9600n81 single'
331    
332    testing="GRUB2 add kernel"
333    grub2Test grub2.1 add/g2-1.1 --add-kernel=/boot/new-kernel.img --title='title' \
334        --initrd=/boot/new-initrd --boot-filesystem=/boot/ --copy-default
335    grub2Test grub2.1 add/g2-1.2 --add-kernel=/boot/new-kernel.img --title='title' \
336        --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
337        --copy-default --make-default
338    grub2Test grub2.1 add/g2-1.3 --add-kernel=/boot/new-kernel.img --title='title' \
339        --boot-filesystem=/boot/ --copy-default --make-default
340    
341    testing="GRUB2 add initrd"
342    grub2Test grub2.2 add/g2-1.4 --update-kernel=/boot/new-kernel.img \
343        --initrd=/boot/new-initrd --boot-filesystem=/boot/
344    
345  testing="YABOOT add kernel"  testing="YABOOT add kernel"
346  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  \
347      --title=newtitle      --title=newtitle

Legend:
Removed from v.1308  
changed lines
  Added in v.1719