Magellan Linux

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

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

revision 532 by niro, Sat Sep 1 22:45:15 2007 UTC revision 1308 by niro, Fri May 27 17:35:32 2011 UTC
# Line 1  Line 1 
1  #!/bin/bash  #!/bin/bash
2    #
3    # test.sh -- grubby regression tests
4    #
5    # Copyright 2007-2008 Red Hat, Inc.  All rights reserved.
6    #
7    # This program is free software; you can redistribute it and/or modify
8    # it under the terms of the GNU General Public License as published by
9    # the Free Software Foundation; either version 2 of the License, or
10    # (at your option) any later version.
11    #
12    # This program is distributed in the hope that it will be useful,
13    # but WITHOUT ANY WARRANTY; without even the implied warranty of
14    # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15    # GNU General Public License for more details.
16    #
17    # You should have received a copy of the GNU General Public License
18    # along with this program.  If not, see <http://www.gnu.org/licenses/>.
19    #
20    
21    if [ -n "$TOPDIR" ]; then
22        LD_LIBRARY_PATH="$TOPDIR/nash:$TOPDIR/bdevid:/usr/lib:/lib"
23        export LD_LIBRARY_PATH
24    fi
25    
26  ARCH=$(uname -m)  #----------------------------------------------------------------------
27    # Global vars
28  elilotest=""  #----------------------------------------------------------------------
29  lilotest=""  
30  grubtest=""  cmd=${0##*/}
31  zipltest=""  opt_bootloader=*
32  yaboottest=""  opt_verbose=false
33    read -d '' usage <<EOT
34  case "$ARCH" in  usage: test.sh [ -hv ]
35      i?86)  
36   lilotest="yes"      -b B   --bootloader=B  Test bootloader B instead of all
37   grubtest="yes"      -h     --help          Show this help message
38   ;;      -v     --verbose       Verbose output
39      x86_64)  EOT
40   lilotest="yes"  declare -i pass=0 fail=0
41   grubtest="yes"  testing=
42   ;;  
43      ppc*)  #----------------------------------------------------------------------
44   yaboottest="yes"  # Functions
45   ;;  #----------------------------------------------------------------------
46      s390*)  
47   zipltest="yes"  oneTest() {
48   ;;      typeset mode=$1 cfg=test/$2 correct=test/results/$3
49      *)      shift 3
50   echo "Not running any tests for $ARCH"  
51   exit 0      echo "$testing ... $mode $cfg $correct"
52  esac      runme=( ./grubby "$mode" --bad-image-okay -c "$cfg" -o - "$@" )
53        if "${runme[@]}" | cmp "$correct" > /dev/null; then
54  export MALLOC_CHECK_=2   (( pass++ ))
55     if $opt_verbose; then
56  RESULT=0      echo -------------------------------------------------------------
57        echo -n "PASS: "
58  oneTest () {      printf "%q " "${runme[@]}"; echo
59      mode=$1      "${runme[@]}" | diff -U30 "$cfg" -
60      cfg=test/$2      echo
61      correct=test/results/$3   fi
62      shift; shift; shift      else
63      ./grubby $mode --bad-image-okay -c $cfg -o - "$@" | cmp $correct > /dev/null   (( fail++ ))
   
     if [ $? != 0 ]; then  
64   echo -------------------------------------------------------------   echo -------------------------------------------------------------
65   echo FAILURE: $cfg $correct "$@"   echo -n "FAIL: "
66   echo -n ./grubby $mode --bad-image-okay -c $cfg -o -   printf "%q " "${runme[@]}"; echo
67   for arg in "$@"; do   "${runme[@]}" | diff -U30 "$correct" -
68      echo -n " \"$arg\""   echo
  done  
  echo ""  
  ./grubby $mode --bad-image-okay -c $cfg -o - "$@" | diff -u $correct -;  
  RESULT=1  
69      fi      fi
70  }  }
71    
72  liloTest() {  # generate convenience functions
73      if [ -z "$lilotest" ]; then echo "skipping LILO test" ; return; fi  for b in $(./grubby --help | \
74      oneTest --lilo "$@"   sed -n 's/^.*--\([^ ]*\) *configure \1 bootloader$/\1/p'); do
75  }      eval "${b}Test() { [[ \"$b\" == \$opt_bootloader ]] && oneTest --$b \"\$@\"; }"
76    done
 eliloTest() {  
     if [ -z "$elilotest" ]; then echo "skipping ELILO test" ; return; fi  
     oneTest --elilo "$@"  
 }  
   
 grubTest() {  
     if [ -z "$grubtest" ]; then echo "skipping GRUB test" ; return; fi  
     oneTest --grub "$@"  
 }  
77    
78  yabootTest() {  #----------------------------------------------------------------------
79      if [ -z "$yaboottest" ]; then echo "skipping YABOOT test" ; return; fi  # Main
80      oneTest --yaboot "$@"  #----------------------------------------------------------------------
81  }  
82    # Use /usr/bin/getopt which supports GNU-style long options
83    args=$(getopt -o b:hv --long bootloader,help,verbose -n "$cmd" -- "$@") || exit
84    eval set -- "$args"
85    while true; do
86        case $1 in
87     -b|--bootloader) opt_bootloader=$2; shift 2 ;;
88     -h|--help) echo "$usage"; exit 0 ;;
89     -v|--verbose) opt_verbose=true; shift ;;
90            --) shift; break ;;
91            *) echo "failed to process cmdline args" >&2; exit 1 ;;
92        esac
93    done
94    
95  ziplTest() {  export MALLOC_CHECK_=2
     if [ -z "$zipltest" ]; then echo "skipping Z/IPL test" ; return; fi  
     oneTest --zipl "$@"  
 }  
96    
97  echo "Parse/write comparison..."  testing="Parse/write comparison"
98  for n in $(cd test; echo grub.[0-9]*); do  for n in test/*.[0-9]*; do
99      grubTest $n ../$n --remove-kernel 1234      n=${n#*/} # remove test/
100        b=${n%.*} # remove suffix
101        [[ $b == $opt_bootloader ]] || continue
102        ${b}Test $n ../$n --remove-kernel 1234
103  done  done
104    
105  for n in $(cd test; echo lilo.[0-9]*); do  testing="Permission preservation"
106      liloTest $n ../$n --remove-kernel 1234  unset b
107    for n in test/*.[0-9]*; do
108        n=${n#*/} # remove test/
109        [[ ${n%.*} == "$b" ]] && continue
110        b=${n%.*} # remove suffix
111        [[ $b == $opt_bootloader ]] || continue
112    
113        echo "$testing ... --$b"
114    
115        cp test/$n ${b}-test
116        chmod 0614 ${b}-test
117        touch -t 200301010101.00 ${b}-test
118        time=$(ls -l ${b}-test | awk '{ print $6 " " $7 " "$8}')
119        perm=$(ls -l ${b}-test | awk '{print $1}')
120        ./grubby --${b} --add-kernel bar --title title -c ${b}-test
121        if [[ $? != 0 ]]; then
122     echo "  FAIL (grubby returned non-zero)"
123     (( fail++ ))
124        elif newtime=$(ls -l ${b}-test | awk '{ print $6 " " $7 " "$8}') && \
125     newperm=$(ls -l ${b}-test | awk '{print $1}') && \
126     [[ $time == "$newtime" || $perm != "$newperm" ]]
127        then
128     echo "  FAIL ($perm $newperm)";
129     (( fail++ ))
130        else
131     (( pass++ ))
132        fi
133        rm -f ${b}-test
134  done  done
135    
136  echo "Permission preservation..."  testing="Following symlinks"
137  cp test/grub.1 grub-test  unset b
138  chmod 0614 grub-test  for n in test/*.[0-9]*; do
139  touch -t 200301010101.00 grub-test      n=${n#*/} # remove test/
140  time=$(ls -l grub-test | awk '{ print $6 " " $7 " "$8}')      [[ ${n%.*} == "$b" ]] && continue
141  perm=$(ls -l grub-test | awk '{print $1}')      b=${n%.*} # remove suffix
142  ./grubby --grub --add-kernel bar --title title -c grub-test      [[ $b == $opt_bootloader ]] || continue
143  newtime=$(ls -l grub-test | awk '{ print $6 " " $7 " "$8}')  
144  newperm=$(ls -l grub-test | awk '{print $1}')      echo "$testing ... --$b"
145  if [ "$time" == "$newtime" -o "$perm" != "$newperm" ]; then  
146      echo "  failed ($perm $newperm)";      cp test/${b}.1 ${b}-test
147  fi      ln -s ./${b}-test mytest
148  rm -f grub-test      ./grubby --${b} --add-kernel bar --title title -c mytest
149        if [[ $? != 0 ]]; then
150  cp test/lilo.1 lilo-test   echo "  failed (grubby returned non-zero)"
151  chmod 0614 lilo-test   (( fail++ ))
152  touch -t 200301010101.00 lilo-test      elif [[ ! -L mytest ]]; then
153  time=$(ls -l lilo-test | awk '{ print $6 " " $7 " "$8}')   echo "  failed (not a symlink)"
154  perm=$(ls -l lilo-test | awk '{print $1}')   (( fail++ ))
155  ./grubby --lilo --add-kernel bar --title title -c lilo-test      elif target=$(readlink mytest) && [[ $target != "./${b}-test" ]]; then
156  newtime=$(ls -l lilo-test | awk '{ print $6 " " $7 " "$8}')   echo "  failed (wrong target)"
157  newperm=$(ls -l lilo-test | awk '{print $1}')   (( fail++ ))
158  if [ "$time" == "$newtime" -o "$perm" != "$newperm" ]; then      else
159      echo "  failed ($perm $newperm)";   (( pass++ ))
160  fi      fi
161  rm -f lilo-test      rm -f ${b}-test mytest
162    done
 echo "Following symlinks..."  
 cp test/grub.1 grub-test  
 ln -s grub-test mytest  
 ./grubby --grub --add-kernel bar --title title -c mytest  
 if [ ! -L mytest ]; then  
     echo " failed (not a symlink)"  
 fi  
 target=$(ls -l mytest | awk '{ print $11 }')  
 if [ "$target" != grub-test ]; then  
     echo "  failed (wrong target)"  
 fi  
 rm -f grub-test mytest  
163    
164  echo "GRUB default directive..."  testing="GRUB default directive"
165  grubTest grub.1 default/g1.1 --boot-filesystem=/boot --add-kernel /boot/new-kernel --title Some_Title  grubTest grub.1 default/g1.1 --boot-filesystem=/boot --add-kernel /boot/new-kernel --title Some_Title
166  grubTest grub.1 default/g1.2 --boot-filesystem=/boot --add-kernel /boot/new-kernel --title Some_Title --make-default  grubTest grub.1 default/g1.2 --boot-filesystem=/boot --add-kernel /boot/new-kernel --title Some_Title --make-default
167  grubTest grub.3 default/g3.1 --boot-filesystem=/boot --set-default=/boot/vmlinuz-2.4.7-2  grubTest grub.3 default/g3.1 --boot-filesystem=/boot --set-default=/boot/vmlinuz-2.4.7-2
# Line 135  grubTest grub.4 default/g4.1 --boot-file Line 170  grubTest grub.4 default/g4.1 --boot-file
170  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
171  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=/
172    
173  echo "LILO default directive..."  testing="LILO default directive"
174  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
175  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
176  liloTest lilo.1 default/l1.3 --add-kernel /boot/kernel --title label \  liloTest lilo.1 default/l1.3 --add-kernel /boot/kernel --title label \
# Line 143  liloTest lilo.1 default/l1.3 --add-kerne Line 178  liloTest lilo.1 default/l1.3 --add-kerne
178  liloTest lilo.1 default/l1.4 --add-kernel /boot/kernel --title label \  liloTest lilo.1 default/l1.4 --add-kernel /boot/kernel --title label \
179      --copy-default --make-default      --copy-default --make-default
180    
181  echo "Z/IPL default directive..."  testing="Z/IPL default directive"
182  ziplTest zipl.1 default/z1.1 --add-kernel /boot/new-kernel --title test  ziplTest zipl.1 default/z1.1 --add-kernel /boot/new-kernel --title test
183  ziplTest zipl.1 default/z1.2 --add-kernel /boot/new-kernel --title test --make-default  ziplTest zipl.1 default/z1.2 --add-kernel /boot/new-kernel --title test --make-default
184    
185  echo "GRUB fallback directive..."  testing="GRUB fallback directive"
186  grubTest grub.5 fallback/g5.1 --remove-kernel=/boot/vmlinuz-2.4.7-ac3 \  grubTest grub.5 fallback/g5.1 --remove-kernel=/boot/vmlinuz-2.4.7-ac3 \
187      --boot-filesystem=/      --boot-filesystem=/
188  grubTest grub.5 fallback/g5.2 --remove-kernel=/boot/vmlinuz-2.4.7-2.5 \  grubTest grub.5 fallback/g5.2 --remove-kernel=/boot/vmlinuz-2.4.7-2.5 \
# Line 156  grubTest grub.5 fallback/g5.3 --remove-k Line 191  grubTest grub.5 fallback/g5.3 --remove-k
191      --boot-filesystem=/ --copy-default --add-kernel=/boot/new-kernel \      --boot-filesystem=/ --copy-default --add-kernel=/boot/new-kernel \
192      --title="Some_Title"      --title="Some_Title"
193    
194  echo "GRUB new kernel argument handling..."  testing="GRUB new kernel argument handling"
195  grubTest grub.1 args/g1.1 --boot-filesystem=/boot \  grubTest grub.1 args/g1.1 --boot-filesystem=/boot \
196      --add-kernel=/boot/foo --title=some_title --args="1234" --copy-default      --add-kernel=/boot/foo --title=some_title --args="1234" --copy-default
197  grubTest grub.1 args/g1.2 --boot-filesystem=/boot \  grubTest grub.1 args/g1.2 --boot-filesystem=/boot \
198      --add-kernel=/boot/foo --title=some_title --args="1234"      --add-kernel=/boot/foo --title=some_title --args="1234"
199    
200  echo "GRUB remove kernel..."  testing="GRUB remove kernel"
201  grubTest grub.7 remove/g7.1 --boot-filesystem=/ \  grubTest grub.7 remove/g7.1 --boot-filesystem=/ \
202      --remove-kernel=/boot/vmlinuz-2.4.7-2.5      --remove-kernel=/boot/vmlinuz-2.4.7-2.5
203  grubTest grub.3 remove/g3.1 --boot-filesystem=/ \  grubTest grub.3 remove/g3.1 --boot-filesystem=/ \
# Line 170  grubTest grub.3 remove/g3.1 --boot-files Line 205  grubTest grub.3 remove/g3.1 --boot-files
205  grubTest grub.9 remove/g9.1 --boot-filesystem=/boot \  grubTest grub.9 remove/g9.1 --boot-filesystem=/boot \
206      --remove-kernel=/boot/vmlinuz-2.4.7-2      --remove-kernel=/boot/vmlinuz-2.4.7-2
207    
208  echo "YABOOT remove kernel..."  testing="YABOOT remove kernel"
209  yabootTest yaboot.1 remove/y1.1 --boot-filesystem=/ --remove-kernel=DEFAULT  yabootTest yaboot.1 remove/y1.1 --boot-filesystem=/ --remove-kernel=DEFAULT
210  yabootTest yaboot.1 remove/y1.2 --boot-filesystem=/ --remove-kernel=/boot/vmlinuz-2.5.50-eepro  yabootTest yaboot.1 remove/y1.2 --boot-filesystem=/ --remove-kernel=/boot/vmlinuz-2.5.50-eepro
211  yabootTest yaboot.2 remove/y2.1 --boot-filesystem=/ --remove-kernel=/boot/vmlinux-2.5.50  yabootTest yaboot.2 remove/y2.1 --boot-filesystem=/ --remove-kernel=/boot/vmlinux-2.5.50
212    
213  echo "Z/IPL remove kernel..."  testing="Z/IPL remove kernel"
214  ziplTest zipl.1 remove/z1.1 --remove-kernel=/boot/vmlinuz-2.4.9-38  ziplTest zipl.1 remove/z1.1 --remove-kernel=/boot/vmlinuz-2.4.9-38
215  ziplTest zipl.1 remove/z1.2 --remove-kernel=DEFAULT  ziplTest zipl.1 remove/z1.2 --remove-kernel=DEFAULT
216    
217  echo "GRUB update kernel argument handling..."  testing="GRUB update kernel argument handling"
218  grubTest grub.1 updargs/g1.1 --update-kernel=DEFAULT --args="root=/dev/hda1"  grubTest grub.1 updargs/g1.1 --update-kernel=DEFAULT --args="root=/dev/hda1"
219  grubTest grub.1 updargs/g1.2 --update-kernel=DEFAULT \  grubTest grub.1 updargs/g1.2 --update-kernel=DEFAULT \
220      --args="root=/dev/hda1 hda=ide-scsi root=/dev/hda2"      --args="root=/dev/hda1 hda=ide-scsi root=/dev/hda2"
# Line 202  grubTest grub.7 updargs/g7.3 --boot-file Line 237  grubTest grub.7 updargs/g7.3 --boot-file
237  grubTest grub.7 updargs/g7.4 --boot-filesystem=/    \  grubTest grub.7 updargs/g7.4 --boot-filesystem=/    \
238      --update-kernel=/vmlinuz-2.4.7-2 \      --update-kernel=/vmlinuz-2.4.7-2 \
239      --args "ro root=LABEL=/ console=tty0 console=ttyS1,9600n81 single"      --args "ro root=LABEL=/ console=tty0 console=ttyS1,9600n81 single"
240    grubTest grub.7 updargs/g7.5 --boot-filesystem=/    \
241        --update-kernel=ALL --args "root=/dev/hda2"
242  grubTest grub.11 updargs/g11.1 --boot-filesystem=/    \  grubTest grub.11 updargs/g11.1 --boot-filesystem=/    \
243      --update-kernel=/vmlinuz-2.4.7-2smp \      --update-kernel=/vmlinuz-2.4.7-2smp \
244      --args "ro root=LABEL=/ console=tty0 console=ttyS1,9600n81 single"      --args "ro root=LABEL=/ console=tty0 console=ttyS1,9600n81 single"
# Line 209  grubTest grub.11 updargs/g11.2 --boot-fi Line 246  grubTest grub.11 updargs/g11.2 --boot-fi
246      --update-kernel=/vmlinuz-2.4.7-2smp \      --update-kernel=/vmlinuz-2.4.7-2smp \
247      --args "ro root=LABEL=/ single"      --args "ro root=LABEL=/ single"
248    
249  echo "LILO update kernel argument handling..."  testing="LILO update kernel argument handling"
250  liloTest lilo.1 updargs/l1.1 --update-kernel=/boot/vmlinuz-2.4.18-4 \  liloTest lilo.1 updargs/l1.1 --update-kernel=/boot/vmlinuz-2.4.18-4 \
251      --args="root=/dev/md1"      --args="root=/dev/md1"
252  liloTest lilo.1 updargs/l1.2 --update-kernel=/boot/vmlinuz-2.4.18-4smp \  liloTest lilo.1 updargs/l1.2 --update-kernel=/boot/vmlinuz-2.4.18-4smp \
# Line 223  liloTest lilo.3 updargs/l3.1 --update-ke Line 260  liloTest lilo.3 updargs/l3.1 --update-ke
260  liloTest lilo.3 updargs/l3.2 --update-kernel=ALL \  liloTest lilo.3 updargs/l3.2 --update-kernel=ALL \
261      --remove-args="single" --args "root=/dev/hda2"      --remove-args="single" --args "root=/dev/hda2"
262    
263  echo "LILO add kernel..."  testing="LILO add kernel"
264  liloTest lilo.4 add/l4.1 --add-kernel=/boot/new-kernel.img --title="title" \  liloTest lilo.4 add/l4.1 --add-kernel=/boot/new-kernel.img --title="title" \
265      --copy-default --boot-filesystem=/boot      --copy-default --boot-filesystem=/boot
266  liloTest lilo.4 add/l4.2 --add-kernel=/boot/new-kernel.img --title="linux" \  liloTest lilo.4 add/l4.2 --add-kernel=/boot/new-kernel.img --title="linux" \
# Line 238  liloTest lilo.6 add/l6.2 --add-kernel=/b Line 275  liloTest lilo.6 add/l6.2 --add-kernel=/b
275    --initrd=/boot/new-initrd --copy-default --boot-filesystem=/boot --remove-kernel "TITLE=linux"    --initrd=/boot/new-initrd --copy-default --boot-filesystem=/boot --remove-kernel "TITLE=linux"
276    
277    
278  echo "GRUB add kernel..."  testing="GRUB add kernel"
279  grubTest grub.1 add/g1.1 --add-kernel=/boot/new-kernel.img --title='title' \  grubTest grub.1 add/g1.1 --add-kernel=/boot/new-kernel.img --title='title' \
280      --initrd=/boot/new-initrd --boot-filesystem=/      --initrd=/boot/new-initrd --boot-filesystem=/
281  grubTest grub.1 add/g1.2 --add-kernel=/boot/new-kernel.img --title='title' \  grubTest grub.1 add/g1.2 --add-kernel=/boot/new-kernel.img --title='title' \
# Line 247  grubTest grub.1 add/g1.3 --add-kernel=/b Line 284  grubTest grub.1 add/g1.3 --add-kernel=/b
284      --initrd=/boot/new-initrd --boot-filesystem=/ --copy-default      --initrd=/boot/new-initrd --boot-filesystem=/ --copy-default
285  grubTest grub.1 add/g1.4 --add-kernel=/boot/new-kernel.img --title='title' \  grubTest grub.1 add/g1.4 --add-kernel=/boot/new-kernel.img --title='title' \
286      --initrd=/boot/new-initrd --boot-filesystem=/boot --copy-default      --initrd=/boot/new-initrd --boot-filesystem=/boot --copy-default
287    grubTest grub.1 add/g1.5 --add-kernel=/boot/new-kernel.img --title='title' \
288        --initrd=/boot/new-initrd --extra-initrd=/boot/extra-initrd --boot-filesystem=/
289    grubTest grub.1 add/g1.6 --add-kernel=/boot/new-kernel.img --title='title' \
290        --initrd=/boot/new-initrd --extra-initrd=/boot/extra-initrd --boot-filesystem=/boot
291  grubTest grub.2 add/g2.1 --add-kernel=/boot/vmlinuz-2.4.7-2    \  grubTest grub.2 add/g2.1 --add-kernel=/boot/vmlinuz-2.4.7-2    \
292      --initrd=/boot/initrd-2.4.7-new.img --boot-filesystem=/boot --copy-default \      --initrd=/boot/initrd-2.4.7-new.img --boot-filesystem=/boot --copy-default \
293      --title="Red Hat Linux (2.4.7-2)"    \      --title="Red Hat Linux (2.4.7-2)"    \
# Line 260  grubTest grub.11 add/g11.1 --add-kernel= Line 301  grubTest grub.11 add/g11.1 --add-kernel=
301      --initrd=/boot/new-initrd --boot-filesystem=/boot --copy-default \      --initrd=/boot/new-initrd --boot-filesystem=/boot --copy-default \
302      --args='console=tty0 console=ttyS1,9600n81 single'      --args='console=tty0 console=ttyS1,9600n81 single'
303    
304  echo "YABOOT add kernel..."  testing="YABOOT add kernel"
305  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  \
306      --title=newtitle      --title=newtitle
307  yabootTest yaboot.1 add/y1.2 --add-kernel=/boot/new-kernel --boot-filesystem=/ --title=newtitle  yabootTest yaboot.1 add/y1.2 --add-kernel=/boot/new-kernel --boot-filesystem=/ --title=newtitle
308    
309  echo "YABOOT empty label..."  testing="YABOOT empty label"
310  yabootTest yaboot.3 add/y3.1 --add-kernel=/boot/new-kernel --boot-filesystem=/ --title=newtitle  yabootTest yaboot.3 add/y3.1 --add-kernel=/boot/new-kernel --boot-filesystem=/ --title=newtitle
311    
312  echo "Z/IPL add kernel..."  testing="Z/IPL add kernel"
313  ziplTest zipl.1 add/z1.1 --add-kernel=/boot/new-kernel.img --title test  ziplTest zipl.1 add/z1.1 --add-kernel=/boot/new-kernel.img --title test
314  ziplTest zipl.1 add/z1.2 --add-kernel=/boot/new-kernel.img --title test --copy-default  ziplTest zipl.1 add/z1.2 --add-kernel=/boot/new-kernel.img --title test --copy-default
315    
316  echo "LILO long titles..."  testing="LILO long titles"
317  liloTest lilo.1 longtitle/l1.1 --add-kernel=/boot/new-kernel.img \  liloTest lilo.1 longtitle/l1.1 --add-kernel=/boot/new-kernel.img \
318      --title="linux-longtitle" --copy-default --boot-filesystem=/boot      --title="linux-longtitle" --copy-default --boot-filesystem=/boot
319  liloTest lilo.1 longtitle/l1.2 --add-kernel=/boot/new-kernel.img \  liloTest lilo.1 longtitle/l1.2 --add-kernel=/boot/new-kernel.img \
# Line 280  liloTest lilo.1 longtitle/l1.2 --add-ker Line 321  liloTest lilo.1 longtitle/l1.2 --add-ker
321  liloTest lilo.7 longtitle/l7.1 --add-kernel=/boot/new-kernel.img \  liloTest lilo.7 longtitle/l7.1 --add-kernel=/boot/new-kernel.img \
322      --title="linux-longtitle-fix" --copy-default --boot-filesystem=/boot      --title="linux-longtitle-fix" --copy-default --boot-filesystem=/boot
323    
324  echo "ELILO long titles..."  testing="ELILO long titles"
325  eliloTest lilo.7 longtitle/e7.1 --add-kernel=/boot/new-kernel.img \  eliloTest lilo.7 longtitle/e7.1 --add-kernel=/boot/new-kernel.img \
326      --title="linux-longtitle-fix" --copy-default --boot-filesystem=/boot      --title="linux-longtitle-fix" --copy-default --boot-filesystem=/boot
327    
328  echo "GRUB add multiboot..."  testing="GRUB add multiboot"
329  grubTest grub.1 multiboot/g1.1 --add-multiboot=/boot/xen.gz \  grubTest grub.1 multiboot/g1.1 --add-multiboot=/boot/xen.gz \
330      --add-kernel=/boot/vmlinuz-2.6.10-1.1088_FC4 --boot-filesystem=/boot \      --add-kernel=/boot/vmlinuz-2.6.10-1.1088_FC4 --boot-filesystem=/boot \
331      --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \      --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \
# Line 308  grubTest grub.10 multiboot/g10.4 --add-k Line 349  grubTest grub.10 multiboot/g10.4 --add-k
349      --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \      --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \
350      --boot-filesystem=/boot      --boot-filesystem=/boot
351    
352  echo "GRUB remove multiboot..."  testing="GRUB remove multiboot"
353  grubTest grub.10 multiboot/g10.5 --boot-filesystem=/boot \  grubTest grub.10 multiboot/g10.5 --boot-filesystem=/boot \
354      --remove-kernel=/boot/vmlinuz-2.6.10-1.1076_FC4      --remove-kernel=/boot/vmlinuz-2.6.10-1.1076_FC4
355  grubTest grub.10 multiboot/g10.6 --boot-filesystem=/boot \  grubTest grub.10 multiboot/g10.6 --boot-filesystem=/boot \
# Line 316  grubTest grub.10 multiboot/g10.6 --boot- Line 357  grubTest grub.10 multiboot/g10.6 --boot-
357  grubTest grub.10 multiboot/g10.7 --boot-filesystem=/boot \  grubTest grub.10 multiboot/g10.7 --boot-filesystem=/boot \
358      --remove-multiboot=/boot/xen.gz      --remove-multiboot=/boot/xen.gz
359    
360  exit $RESULT  testing="ELILO add multiboot"
361    eliloTest elilo.1 multiboot/e1.1 --add-multiboot=/boot/xen.gz \
362        --add-kernel=/boot/vmlinuz-2.6.10-1.1088_FC4 --boot-filesystem=/boot \
363        --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \
364        --mbargs="dom0_mem=130000"
365    eliloTest elilo.1 multiboot/e1.2 --add-multiboot=/boot/xen.gz \
366        --add-kernel=/boot/vmlinuz-2.6.10-1.1088_FC4 --boot-filesystem=/boot \
367        --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \
368        --mbargs="dom0_mem=130000" --copy-default
369    
370    testing="ELILO remove multiboot"
371    eliloTest elilo.2 multiboot/e2.1 --boot-filesystem=/boot \
372        --remove-kernel=/boot/vmlinuz-2.6.10-1.1076_FC4
373    eliloTest elilo.2 multiboot/e2.2 --boot-filesystem=/boot \
374        --remove-kernel=/boot/vmlinuz-2.6.10-1.1082_FC4
375    eliloTest elilo.2 multiboot/e2.3 --boot-filesystem=/boot \
376        --remove-multiboot=/boot/xen.gz
377    
378    printf "\n%d (%d%%) tests passed, %d (%d%%) tests failed\n" \
379        $pass $(((100*pass)/(pass+fail))) \
380        $fail $(((100*fail)/(pass+fail)))
381    
382    exit $(( !!fail ))

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