Attached!
-- bvk.chaitanya
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bvk.gro...@gmail.com-20100317021252-1cts9bjol2lkd2a2 # target_branch: file:///home/bvk/work/grub2/mainline/ # testament_sha1: 9b533426627983a43022b8a2918a3b40f00984a0 # timestamp: 2010-03-17 07:43:03 +0530 # base_revision_id: bvk.gro...@gmail.com-20100314170717-\ # q8ppihzgyjyifcke # # Begin patch === modified file 'conf/tests.rmk' --- conf/tests.rmk 2010-01-22 13:37:27 +0000 +++ conf/tests.rmk 2010-03-17 02:12:52 +0000 @@ -50,6 +50,9 @@ check_SCRIPTS += grub_script_vars1 grub_script_vars1_SOURCES = tests/grub_script_vars1.in +check_SCRIPTS += lvm_test +lvm_test_SOURCES = tests/lvm_test.in + # List of tests to execute on "make check" # SCRIPTED_TESTS = example_scripted_test # SCRIPTED_TESTS += example_grub_script_test @@ -59,6 +62,7 @@ SCRIPTED_TESTS = grub_script_echo1 SCRIPTED_TESTS += grub_script_echo_keywords SCRIPTED_TESTS += grub_script_vars1 +SCRIPTED_TESTS += lvm_test # dependencies between tests and testing-tools $(SCRIPTED_TESTS): grub-shell grub-shell-tester === added file 'tests/lvm_test.in' --- tests/lvm_test.in 1970-01-01 00:00:00 +0000 +++ tests/lvm_test.in 2010-03-17 02:12:52 +0000 @@ -0,0 +1,56 @@ +#! /bin/bash -e + +lvm=/sbin/lvmn +parted=/sbin/parted +losetup=/sbin/losetup +grubshe...@builddir@/grub-shell + +if test `id -u` != "0"; then + exit 0 +fi + +check_output () { + outfile=$1 + shift + + for disk in $@; do + if ! grep "($disk)" ${outfile} >/dev/null + then + echo "($disk): disk/partiton not found" + exit 1 + fi + done +} + +size=128M +disk1=`mktemp` +disk2=`mktemp` + +qemu-img create ${disk1} ${size} >/dev/null +qemu-img create ${disk2} ${size} >/dev/null + +${parted} -s ${disk1} mklabel msdos mkpart primary 0 100% +${parted} -s ${disk2} mklabel msdos mkpart primary 0 100% + +dev1=`${losetup} -f --show ${disk1}` +dev2=`${losetup} -f --show ${disk2}` + +${lvm} pvcreate --quiet ${dev1} ${dev2} +${lvm} vgcreate --quiet vol1 ${dev1} ${dev2} +${lvm} lvcreate --quiet -n foo -L 20M vol1 +${lvm} lvcreate --quiet -n bar -L 20M vol1 +${lvm} lvcreate --quiet -n baz -L 20M vol1 + +${lvm} lvchange --quiet -a n /dev/vol1/foo +${lvm} lvchange --quiet -a n /dev/vol1/bar +${lvm} lvchange --quiet -a n /dev/vol1/baz +${lvm} vgchange --quiet -a n vol1 + +${losetup} -d ${dev1} +${losetup} -d ${dev2} + +outfile=`mktemp` +echo "insmod lvm; ls" | ${grubshell} --boot=cd --qemu-opts="-hda ${disk1} -hdb ${disk2}" --modules=lvm | tee ${outfile} +check_output ${outfile} hd0 hd1 vol1-foo vol1-bar vol1-baz + +rm -f ${disk1} ${disk2} ${outfile} # Begin bundle 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 BA1APLA=
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel