From: Karel Zak <kzak@redhat.com>
Date: Fri, 20 Jul 2007 13:08:54 +0000 (+0200)
Subject: tests: use $AWK based on configure results
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2c6354ff7c2f8787d6a3b55631eda661b310026;p=util-linux

tests: use $AWK based on configure results

The hardcoded "gawk" seems like a bad idea.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index f8128bb8..a9572e06 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -1,6 +1,8 @@
 TOPDIR=@top_srcdir@
 TS_TOPDIR=$TOPDIR/tests
 
+AWK=@AWK@
+
 # Misc settings
 TS_TESTUSER=${TS_TESTUSER:-"test"}
 
diff --git a/tests/functions.sh b/tests/functions.sh
index 3b10e1af..fffd7946 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -60,7 +60,7 @@ function ts_log {
 function ts_has_option {
 	NAME="$1"
 	ALL="$2"
-	echo -n $ALL | sed 's/ //g' | gawk 'BEGIN { FS="="; RS="--" } /('$NAME'$|'$NAME'=)/ { print "yes" }'
+	echo -n $ALL | sed 's/ //g' | $AWK 'BEGIN { FS="="; RS="--" } /('$NAME'$|'$NAME'=)/ { print "yes" }'
 }
 
 function ts_init {
@@ -167,7 +167,7 @@ function ts_device_init {
 	dd if=/dev/zero of="$IMAGE" bs=1M count=5 &> /dev/null
 
 	$TS_CMD_LOSETUP -f "$IMAGE" 2>&1 >> $TS_OUTPUT
-	DEV=$( $TS_CMD_LOSETUP -a | gawk 'BEGIN {FS=":"} /'$IMAGE_RE'/ { print $1 }' )
+	DEV=$( $TS_CMD_LOSETUP -a | $AWK 'BEGIN {FS=":"} /'$IMAGE_RE'/ { print $1 }' )
 
 	if [ -z "$DEV" ]; then
 		ts_device_deinit $DEV
diff --git a/tests/ts-ipcs.sh b/tests/ts-ipcs.sh
index 09790a4e..ff35e75e 100644
--- a/tests/ts-ipcs.sh
+++ b/tests/ts-ipcs.sh
@@ -38,9 +38,9 @@ IPCS_KERNEL_CMD=(
 
 # data from the ipcs command
 IPCS_CMD=(
-	"$TS_CMD_IPCS -m -l | gawk '/max number of segments/ { print \$6 }'"
-	"$TS_CMD_IPCS -m -l | gawk '/max total shared memory/ { print \$7 }'"
-	"$TS_CMD_IPCS -m -l | gawk '/max seg size/ { print \$6 }'"
+	"$TS_CMD_IPCS -m -l | $AWK '/max number of segments/ { print \$6 }'"
+	"$TS_CMD_IPCS -m -l | $AWK '/max total shared memory/ { print \$7 }'"
+	"$TS_CMD_IPCS -m -l | $AWK '/max seg size/ { print \$6 }'"
 )