Magellan Linux

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

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

revision 1727 by niro, Sat Feb 18 00:57:49 2012 UTC revision 2234 by niro, Mon Oct 21 13:16:58 2013 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 -------------------------------------------------------------
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 91  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  }  }
# Line 121  while true; do Line 126  while true; do
126  done  done
127    
128  export MALLOC_CHECK_=2  export MALLOC_CHECK_=2
129    if [ -n "${RANDOM}" ]; then
130        export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
131    else
132        export MALLOC_PERTURB_=1
133    fi
134    
135  testing="Parse/write comparison"  testing="Parse/write comparison"
136  for n in test/*.[0-9]*; do  for n in test/*.[0-9]*; do
137        [ -d $n ] && continue
138      n=${n#*/} # remove test/      n=${n#*/} # remove test/
139      b=${n%.*} # remove suffix      b=${n%.*} # remove suffix
140      [[ $b == $opt_bootloader ]] || continue      [[ $b == $opt_bootloader ]] || continue
# Line 198  grubTest grub.4 default/g4.1 --boot-file Line 209  grubTest grub.4 default/g4.1 --boot-file
209  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
210  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=/
211    
212    testing="GRUB default index directive"
213    grubTest grub.13 setdefaultindex/g.13.0 --set-default-index=0
214    grubTest grub.13 setdefaultindex/g.13.1 --set-default-index=1
215    grubTest grub.13 setdefaultindex/g.13.9 --set-default-index=9
216    
217  testing="GRUB display default index"  testing="GRUB display default index"
218  grubDisplayTest grub.1 defaultindex/0 --default-index  grubDisplayTest grub.1 defaultindex/0 --default-index
219  grubDisplayTest grub.2 defaultindex/0 --default-index  grubDisplayTest grub.2 defaultindex/0 --default-index
# Line 300  grubTest grub.11 updargs/g11.2 --boot-fi Line 316  grubTest grub.11 updargs/g11.2 --boot-fi
316      --update-kernel=/vmlinuz-2.4.7-2smp \      --update-kernel=/vmlinuz-2.4.7-2smp \
317      --args "ro root=LABEL=/ single"      --args "ro root=LABEL=/ single"
318    
319    testing="GRUB lba and root information on SuSE systems"
320    GRUBBY_SUSE_RELEASE=test/grub.12-support_files/etc/SuSE-release \
321        GRUBBY_SUSE_GRUB_CONF=test/grub.12-support_files/etc/grub.conf \
322        GRUBBY_GRUB_DEVICE_MAP=test/grub.12-support_files/boot/grub/device.map \
323        grubTest grub.12 info/g12.1 --info=0
324    
325  testing="LILO update kernel argument handling"  testing="LILO update kernel argument handling"
326  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 \
327      --args="root=/dev/md1"      --args="root=/dev/md1"
# Line 358  grubTest grub.11 add/g11.1 --add-kernel= Line 380  grubTest grub.11 add/g11.1 --add-kernel=
380  testing="GRUB2 add kernel"  testing="GRUB2 add kernel"
381  grub2Test grub2.1 add/g2-1.1 --add-kernel=/boot/new-kernel.img --title='title' \  grub2Test grub2.1 add/g2-1.1 --add-kernel=/boot/new-kernel.img --title='title' \
382      --initrd=/boot/new-initrd --boot-filesystem=/boot/ --copy-default      --initrd=/boot/new-initrd --boot-filesystem=/boot/ --copy-default
383    grub2Test grub2.1 add/g2-1.6 --add-kernel=/boot/new-kernel.img --title='title' \
384        --initrd=/boot/new-initrd --boot-filesystem=/boot/ --copy-default --efi
385    grub2Test grub2.6 add/g2-1.7 --add-kernel=/boot/new-kernel.img --title='title' \
386        --initrd=/boot/new-initrd --boot-filesystem=/boot/ --copy-default --efi
387  grub2Test grub2.1 add/g2-1.2 --add-kernel=/boot/new-kernel.img --title='title' \  grub2Test grub2.1 add/g2-1.2 --add-kernel=/boot/new-kernel.img --title='title' \
388      --initrd=/boot/new-initrd --boot-filesystem=/boot/ \      --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
389      --copy-default --make-default      --copy-default --make-default
# Line 365  grub2Test grub2.1 add/g2-1.3 --add-kerne Line 391  grub2Test grub2.1 add/g2-1.3 --add-kerne
391      --boot-filesystem=/boot/ --copy-default --make-default      --boot-filesystem=/boot/ --copy-default --make-default
392  grub2Test grub2.1 remove/g2-1.4 --remove-kernel=/boot/vmlinuz-2.6.38.2-9.fc15.x86_64 \  grub2Test grub2.1 remove/g2-1.4 --remove-kernel=/boot/vmlinuz-2.6.38.2-9.fc15.x86_64 \
393      --boot-filesystem=/boot/      --boot-filesystem=/boot/
394    grub2Test grub2.5 add/g2-1.5 --add-kernel=/boot/new-kernel.img --title='title' \
395        --initrd=/boot/new-initrd --boot-filesystem=/boot/ --copy-default
396    
397  testing="GRUB2 add initrd"  testing="GRUB2 add initrd"
398  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 374  testing="GRUB2 display default index" Line 402  testing="GRUB2 display default index"
402  grub2DisplayTest grub2.1 defaultindex/0 --default-index  grub2DisplayTest grub2.1 defaultindex/0 --default-index
403  grub2DisplayTest grub2.2 defaultindex/0 --default-index  grub2DisplayTest grub2.2 defaultindex/0 --default-index
404    
405  testing="GRUB display default title"  testing="GRUB2 display default title"
406  grub2DisplayTest grub2.1 defaulttitle/g2.1 --default-title  grub2DisplayTest grub2.1 defaulttitle/g2.1 --default-title
407  grub2DisplayTest grub2.2 defaulttitle/g2.2 --default-title  grub2DisplayTest grub2.2 defaulttitle/g2.2 --default-title
408    
409    testing="GRUB2 display debug failure"
410    grub2DisplayTest grub2.1 debug/g2.1 --bad-image-bad --boot-filesystem=/boot --default-kernel --debug
411    testing="GRUB2 display debug success"
412    grub2DisplayTest grub2.1 debug/g2.1.2 --boot-filesystem=/boot --default-kernel --debug
413    
414    testing="GRUB2 remove kernel via index"
415    grub2Test grub2.3 remove/g2-1.1 --remove-kernel=1
416    
417    testing="GRUB2 remove kernel via title"
418    grub2Test grub2.3 remove/g2-1.1 --remove-kernel="TITLE=title2"
419    
420    testing="GRUB2 (submenu) remove kernel via index"
421    grub2Test grub2.4 remove/g2-1.2 --remove-kernel=2
422    
423    testing="GRUB2 (submenu) remove kernel via title"
424    grub2Test grub2.4 remove/g2-1.2 --remove-kernel="TITLE=title2"
425    
426    testing="GRUB2 default index directive"
427    grub2Test grub2.1 setdefaultindex/g2.1.0 --set-default-index=0
428    grub2Test grub2.1 setdefaultindex/g2.1.1 --set-default-index=1
429    grub2Test grub2.1 setdefaultindex/g2.1.9 --set-default-index=9
430    
431  testing="YABOOT add kernel"  testing="YABOOT add kernel"
432  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  \
433      --title=newtitle      --title=newtitle

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