From 6361810b53be4d5e0513b4f7c11d29cf1d6d3b45 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 15 Sep 2012 13:21:55 +0100 Subject: syntax: Replace test == with = or -eq as appropriate. Found by 'make syntax-check'. --- autogen.sh | 2 +- tests/md/test-mdadm.sh | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/autogen.sh b/autogen.sh index 794d25c4..fcdd0ce5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -44,7 +44,7 @@ fi # If no arguments were specified and configure has run before, use the previous # arguments -if test $# == 0 && test -x ./config.status; then +if test $# -eq 0 && test -x ./config.status; then ./config.status --recheck else $CONFIGUREDIR/configure "$@" diff --git a/tests/md/test-mdadm.sh b/tests/md/test-mdadm.sh index c72cd503..6898a1fe 100755 --- a/tests/md/test-mdadm.sh +++ b/tests/md/test-mdadm.sh @@ -114,28 +114,28 @@ for md in `../../fish/guestfish --remote list-md-devices`; do error=0 case "$name" in *:r1t1) - [ "$level" == "raid1" ] || error=1 - [ "$devices" == "2" ] || error=1 + [ "$level" = "raid1" ] || error=1 + [ "$devices" -eq 2 ] || error=1 ;; *:r1t2) - [ "$level" == "raid1" ] || error=1 - [ "$devices" == "2" ] || error=1 + [ "$level" = "raid1" ] || error=1 + [ "$devices" -eq 2 ] || error=1 ;; *:r5t1) - [ "$level" == "raid5" ] || error=1 - [ "$devices" == "4" ] || error=1 + [ "$level" = "raid5" ] || error=1 + [ "$devices" -eq 4 ] || error=1 ;; *:r5t2) - [ "$level" == "raid5" ] || error=1 - [ "$devices" == "3" ] || error=1 + [ "$level" = "raid5" ] || error=1 + [ "$devices" -eq 3 ] || error=1 ;; *:r5t3) - [ "$level" == "raid5" ] || error=1 - [ "$devices" == "2" ] || error=1 + [ "$level" = "raid5" ] || error=1 + [ "$devices" -eq 2 ] || error=1 ;; *) @@ -145,7 +145,7 @@ for md in `../../fish/guestfish --remote list-md-devices`; do [[ "$uuid" =~ ([0-9a-f]{8}:){3}[0-9a-f]{8} ]] || error=1 [ ! -z "$metadata" ] || error=1 - if [ "$error" == "1" ]; then + if [ "$error" -eq 1 ]; then echo "$0: Unexpected output from md-detail for device $md" cat md-detail.out ../../fish/guestfish --remote exit -- cgit