public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/test lvm-utils.sh t-pvchange-usage.sh Date: Mon, 02 Aug 2010 13:20:00 -0000 [thread overview] Message-ID: <20100802132050.10347.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2010-08-02 13:20:50 Modified files: test : lvm-utils.sh t-pvchange-usage.sh Log message: Add shell function to trim spaces. Test values as "$val" to avoid weird results when spaces are in output. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/lvm-utils.sh.diff?cvsroot=lvm2&r1=1.25&r2=1.26 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-pvchange-usage.sh.diff?cvsroot=lvm2&r1=1.4&r2=1.5 --- LVM2/test/lvm-utils.sh 2010/08/02 13:18:01 1.25 +++ LVM2/test/lvm-utils.sh 2010/08/02 13:20:50 1.26 @@ -16,6 +16,14 @@ ME=$(basename "$0") warn() { echo >&2 "$ME: $@"; } +trim() +{ + trimmed=${1%% } + trimmed=${trimmed## } + + echo "$trimmed" +} + compare_two_fields_() { local cmd1=$1; @@ -33,7 +41,7 @@ then echo "compare_two_fields_ $obj1($field1): $val1 $obj2($field2): $val2" fi - test $val1 = $val2 + test "$val1" = "$val2" } compare_vg_field_() @@ -50,7 +58,7 @@ then echo "compare_vg_field_ VG1: $val1 VG2: $val2" fi - test $val1 = $val2 + test "$val1" = "$val2" } @@ -82,12 +90,12 @@ local expected=$3; local actual; - actual=$(vgs --noheadings -o $field $vg) + actual=$(trim $(vgs --noheadings -o $field $vg)) if test "$verbose" = "t" then echo "check_vg_field_ VG=$vg, field=$field, actual=$actual, expected=$expected" fi - test $actual = $expected + test "$actual" = "$expected" } check_pv_field_() @@ -97,12 +105,12 @@ local expected=$3; local actual; - actual=$(pvs --noheadings -o $field $pv) + actual=$(trim $(pvs --noheadings -o $field $pv)) if test "$verbose" = "t" then echo "check_pv_field_ PV=$pv, field=$field, actual=$actual, expected=$expected" fi - test $actual = $expected + test "$actual" = "$expected" } check_lv_field_() @@ -112,12 +120,12 @@ local expected=$3; local actual; - actual=$(lvs --noheadings -o $field $lv) + actual=$(trim $(lvs --noheadings -o $field $lv)) if test "$verbose" = "t" then echo "check_lv_field_ LV=$lv, field=$field, actual=$actual, expected=$expected" fi - test $actual = $expected + test "$actual" = "$expected" } vg_validate_pvlv_counts_() --- LVM2/test/t-pvchange-usage.sh 2010/03/17 17:02:01 1.4 +++ LVM2/test/t-pvchange-usage.sh 2010/08/02 13:20:50 1.5 @@ -26,7 +26,7 @@ pvchange $dev1 --addtag test$mda check_pv_field_ $dev1 pv_tags test$mda pvchange $dev1 --deltag test$mda - check_pv_field_ $dev1 pv_tags " " + check_pv_field_ $dev1 pv_tags "" # "vgchange disable/enable allocation for pvs with metadatacopies = $mda (bz452982)" pvchange $dev1 -x n
reply other threads:[~2010-08-02 13:20 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20100802132050.10347.qmail@sourceware.org \ --to=zkabelac@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).