/[magellan-source]/tags/grubby-8_34/test.sh

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

Parent Directory | 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 1801 by niro,
Mon Apr 16 17:48:10 2012 UTC
 Line 69 
 oneTest() {
      fi
  }
+ # Test feature that display some information, checking that output instead of
+ # the generated configuration file
+ oneDisplayTest() {
+     typeset mode=$1 cfg=test/$2 correct=test/results/$3
+     shift 3
+     local BIO="--bad-image-okay"
+     if [ "$1" == "--bad-image-bad" ]; then
+         BIO=""
+         shift
+     fi
+     echo "$testing ... $mode $cfg $correct"
+     runme=( ./grubby "$mode" $BIO -c "$cfg" "$@" )
+     if "${runme[@]}" |& cmp "$correct" > /dev/null; then
+ 	(( pass++ ))
+ 	if $opt_verbose; then
+ 	    echo -------------------------------------------------------------
+ 	    echo -n "PASS: "
+ 	    printf "%q " "${runme[@]}"; echo
+ 	    "${runme[@]}" |& diff -U30 "$cfg" -
+ 	    echo
+ 	fi
+     else
+ 	(( fail++ ))
+ 	echo -------------------------------------------------------------
+ 	echo -n "FAIL: "
+ 	printf "%q " "${runme[@]}"; echo
+ 	"${runme[@]}" |& diff -U30 "$correct" -
+ 	echo
+     fi
+ }
  # generate convenience functions
  for b in $(./grubby --help | \
  	sed -n 's/^.*--\([^ ]*\) *configure \1 bootloader$/\1/p'); do
      eval "${b}Test() { [[ \"$b\" == \$opt_bootloader ]] && oneTest --$b \"\$@\"; }"
+     eval "${b}DisplayTest() { [[ \"$b\" == \$opt_bootloader ]] && oneDisplayTest --$b \"\$@\"; }"
  done
  #----------------------------------------------------------------------
-Line 170 
 grubTest grub.4 default/g4.1 --boot-file
+Line 203 
 grubTest grub.4 default/g4.1 --boot-file
  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.6 default/g6.1 --remove-kernel=/boot/vmlinuz-2.4.7-2.9 --boot-filesystem=/
+ testing="GRUB display default index"
+ grubDisplayTest grub.1 defaultindex/0 --default-index
+ grubDisplayTest grub.2 defaultindex/0 --default-index
+ grubDisplayTest grub.3 defaultindex/0 --default-index
+ grubDisplayTest grub.4 defaultindex/0 --default-index
+ grubDisplayTest grub.5 defaultindex/0 --default-index
+ grubDisplayTest grub.6 defaultindex/2 --default-index
+ grubDisplayTest grub.7 defaultindex/2 --default-index
+ grubDisplayTest grub.8 defaultindex/0 --default-index
+ grubDisplayTest grub.9 defaultindex/0 --default-index
+ grubDisplayTest grub.10 defaultindex/0 --default-index
+ grubDisplayTest grub.10 defaultindex/0 --default-index
+ testing="GRUB display default title"
+ grubDisplayTest grub.1 defaulttitle/g.1 --default-title
+ grubDisplayTest grub.2 defaulttitle/g.2 --default-title
+ grubDisplayTest grub.3 defaulttitle/g.3 --default-title
+ grubDisplayTest grub.4 defaulttitle/g.4 --default-title
+ grubDisplayTest grub.5 defaulttitle/g.5 --default-title
+ grubDisplayTest grub.6 defaulttitle/g.6 --default-title
+ grubDisplayTest grub.7 defaulttitle/g.7 --default-title
+ grubDisplayTest grub.8 defaulttitle/g.8 --default-title
+ grubDisplayTest grub.9 defaulttitle/g.9 --default-title
+ grubDisplayTest grub.10 defaulttitle/g.10 --default-title
+ grubDisplayTest grub.11 defaulttitle/g.11 --default-title
  testing="LILO default directive"
  liloTest lilo.1 default/l1.1 --set-default=/boot/vmlinuz-2.4.18-4
  liloTest lilo.1 default/l1.2 --remove-kernel=/boot/vmlinuz-2.4.18-4smp
-Line 301 
 grubTest grub.11 add/g11.1 --add-kernel=
+Line 360 
 grubTest grub.11 add/g11.1 --add-kernel=
      --initrd=/boot/new-initrd --boot-filesystem=/boot --copy-default \
      --args='console=tty0 console=ttyS1,9600n81 single'
+ testing="GRUB2 add kernel"
+ grub2Test grub2.1 add/g2-1.1 --add-kernel=/boot/new-kernel.img --title='title' \
+     --initrd=/boot/new-initrd --boot-filesystem=/boot/ --copy-default
+ grub2Test grub2.1 add/g2-1.2 --add-kernel=/boot/new-kernel.img --title='title' \
+     --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
+     --copy-default --make-default
+ grub2Test grub2.1 add/g2-1.3 --add-kernel=/boot/new-kernel.img --title='title' \
+     --boot-filesystem=/boot/ --copy-default --make-default
+ grub2Test grub2.1 remove/g2-1.4 --remove-kernel=/boot/vmlinuz-2.6.38.2-9.fc15.x86_64 \
+     --boot-filesystem=/boot/
+ testing="GRUB2 add initrd"
+ grub2Test grub2.2 add/g2-1.4 --update-kernel=/boot/new-kernel.img \
+     --initrd=/boot/new-initrd --boot-filesystem=/boot/
+ testing="GRUB2 display default index"
+ grub2DisplayTest grub2.1 defaultindex/0 --default-index
+ grub2DisplayTest grub2.2 defaultindex/0 --default-index
+ testing="GRUB2 display default title"
+ grub2DisplayTest grub2.1 defaulttitle/g2.1 --default-title
+ grub2DisplayTest grub2.2 defaulttitle/g2.2 --default-title
+ testing="GRUB2 display debug failure"
+ grub2DisplayTest grub2.1 debug/g2.1 --bad-image-bad --boot-filesystem=/boot --default-kernel --debug
+ testing="GRUB2 display debug success"
+ grub2DisplayTest grub2.1 debug/g2.1.2 --boot-filesystem=/boot --default-kernel --debug
+ testing="GRUB2 remove kernel via index"
+ grub2Test grub2.3 remove/g2-1.1 --remove-kernel=1
+ testing="GRUB2 remove kernel via title"
+ grub2Test grub2.3 remove/g2-1.1 --remove-kernel="TITLE=title2"
+ testing="GRUB2 (submenu) remove kernel via index"
+ grub2Test grub2.4 remove/g2-1.2 --remove-kernel=2
+ testing="GRUB2 (submenu) remove kernel via title"
+ grub2Test grub2.4 remove/g2-1.2 --remove-kernel="TITLE=title2"
  testing="YABOOT add kernel"
  yabootTest yaboot.1 add/y1.1 --copy-default --boot-filesystem=/ --add-kernel=/boot/new-kernel  \
      --title=newtitle

 Legend:



Removed from v.1308
 


changed lines


 
Added in v.1801
 Legend:



Removed from v.1308
 


changed lines


 
Added in v.1801
-Removed from v.1308
+Added in v.1801