From c2163a6954248dae9fe12d0ab86a04c4839261dd Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Tue, 17 May 2011 22:07:24 -0300 Subject: [PATCH] prod/Common (expect, expect_re): allow multiple arguments (for options) --- prod/Common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prod/Common b/prod/Common index d1dafbf..2afa9b9 100644 --- a/prod/Common +++ b/prod/Common @@ -95,7 +95,7 @@ cmd() expect() { eval "$cmd" >_out 2>&1 || { echo "exit code $?" | fail; exit 1; } - fgrep -q "$1" _out || { echo "expected $1" | fail; exit 1; } + fgrep -q "$@" _out || { echo "expected $*" | fail; exit 1; } pass } @@ -103,7 +103,7 @@ expect() expect_re() { eval "$cmd" >_out 2>&1 || { echo "exit code $?" | fail; exit 1; } - grep -q "$1" _out || { echo "expected $1" | fail; exit 1; } + grep -q "$@" _out || { echo "expected $*" | fail; exit 1; } pass }