libtest: Support matching multiple regexps in files

For a future patch. Closes: #652 Approved by: jlebon
coreos · May 12, 2017 · 17626d2 · 17626d2
1 parent 3fae2ea
commit 17626d2
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/tests/common/libtest.sh b/tests/common/libtest.sh
@@ -141,11 +141,15 @@ assert_not_has_dir () {
 }
 
 assert_file_has_content () {
-    if ! grep -q -e "$2" "$1"; then
-        sed -e 's/^/# /' < "$1" >&2
-        echo 1>&2 "File '$1' doesn't match regexp '$2'"
-        exit 1
-    fi
+    fpath=$1
+    shift
+    for re in $@; do
+        if ! grep -q -e "$re" "$fpath"; then
+            sed -e 's/^/# /' < "$1" >&2
+            echo 1>&2 "File '$1' doesn't match regexp '$2'"
+            exit 1
+        fi
+    done
 }
 
 assert_file_empty() {